test some things

CriesofCarrots · May 8, 2021 · f0ff685 · f0ff685
1 parent 17a13f4
commit f0ff685
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/pull-request-docs.yml b/.github/workflows/pull-request-docs.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   check_non_docs:
     outputs:
-      run_job: ${{ steps.check_files.outputs.run_all_github_action_checks }}
+      run_all_github_action_checks: ${{ steps.check_files.outputs.run_all_github_action_checks }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -23,8 +23,8 @@ jobs:
       - name: check modified files
         id: check_files
         run: |
-          git diff --name-only HEAD^ HEAD > files.txt
           echo "::set-output name=run_all_github_action_checks::true"
+          git diff --name-only HEAD^ HEAD > files.txt
           while IFS= read -r file
           do
             if [[ $file != docs/** ]]; then
@@ -34,7 +34,6 @@ jobs:
             fi
           done < files.txt
 
-
   all_github_action_checks:
     runs-on: ubuntu-latest
     needs: check_non_docs

diff --git a/.mergify.yml b/.mergify.yml
@@ -9,7 +9,7 @@ pull_request_rules:
       - check-success=Travis CI - Pull Request
       - check-success=all_github_action_checks
       - label=automerge
-      - author≠@dont-squash-my-commits
+      # - author≠@dont-squash-my-commits
     actions:
       merge:
         method: squash
@@ -19,7 +19,7 @@ pull_request_rules:
       - check-success=Travis CI - Pull Request
       - check-success=all_github_action_checks
       - label=automerge
-      - author=@dont-squash-my-commits
+      # - author=@dont-squash-my-commits
     actions:
       merge:
         method: rebase