Merge pull request #12297 from goanpeca/fix/merge-cancels

PR: Only cancel previous builds on pull_request events
spyder-ide · Apr 12, 2020 · 0bb255f · 0bb255f
2 parents 65ee504 + e79014e
commit 0bb255f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/.github/scripts/check_skip_py.sh b/.github/scripts/check_skip_py.sh
@@ -4,7 +4,7 @@ HEAD_REF=$(git rev-parse HEAD)
 echo "base: $BASE_REF"
 echo "head: $HEAD_REF"
 FILES=$(git diff --name-only $BASE_REF $HEAD_REF)
-COUNT=$(echo $FILES | grep -c ".*\.py.*")
+COUNT=$(echo $FILES | grep -c ".*\.py.*\|.*MANIFEST\.in.*\|.*\.sh.*\|.*\.bat.*\|.*\.yml.*\|.*\conda.txt.*\|.*tests.txt.*")
 
 echo "Files including the filter: $FILES"
 echo "Py files filter count: $COUNT"

diff --git a/.github/workflows/test-files.yml b/.github/workflows/test-files.yml
@@ -17,9 +17,11 @@ jobs:
   cleanup-previous-runs:
     runs-on: ubuntu-latest
     steps:
-    - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - run: echo $GITHUB_EVENT_NAME
+      - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
+        if: github.event_name == 'pull_request'
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
   build:
     name: Py${{ matrix.PYTHON_VERSION }}

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -17,9 +17,11 @@ jobs:
   cleanup-previous-runs:
     runs-on: ubuntu-latest
     steps:
-    - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - run: echo $GITHUB_EVENT_NAME
+      - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
+        if: github.event_name == 'pull_request'
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
   build:
     name: Py${{ matrix.PYTHON_VERSION }}, ${{ matrix.INSTALL_TYPE }}, ${{ matrix.TEST_TYPE }}

diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -17,9 +17,11 @@ jobs:
   cleanup-previous-runs:
     runs-on: ubuntu-latest
     steps:
-    - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - run: echo $GITHUB_EVENT_NAME
+      - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
+        if: github.event_name == 'pull_request'
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
   build:
     name: Py${{ matrix.PYTHON_VERSION }}, ${{ matrix.INSTALL_TYPE }}, ${{ matrix.TEST_TYPE }}

diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -17,9 +17,11 @@ jobs:
   cleanup-previous-runs:
     runs-on: ubuntu-latest
     steps:
-    - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - run: echo $GITHUB_EVENT_NAME
+      - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
+        if: github.event_name == 'pull_request'
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
   build:
     name: Py${{ matrix.PYTHON_VERSION }}, ${{ matrix.INSTALL_TYPE }}, ${{ matrix.TEST_TYPE }}