More agressive skipping of duplicate workflows (#50042)

* More agressive skipping of duplicate workflows
CleverRaven · Jul 19, 2021 · 8d53c58 · 8d53c58
1 parent 91dccb2
commit 8d53c58
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 43 deletions.
diff --git a/.github/workflows/CBA.yml b/.github/workflows/CBA.yml
@@ -4,36 +4,30 @@ on:
   push:
     branches:
     - master
-    - 0.F-dev
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
-    - '**/CMakeLists.txt'
-    - '**/Makefile'
-    - '**.hpp'
-    - '**.cmake'
-    - '.github/workflows/CBA.yml'
   pull_request:
     branches:
     - master
-    - 0.F-dev
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
-    - '**/CMakeLists.txt'
-    - '**/Makefile'
-    - '**.hpp'
-    - '**.cmake'
-    - '.github/workflows/CBA.yml'
 
 
 jobs:
+  skip-duplicates:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          cancel_others: 'true'
+          paths: '[ "**.cpp", "**.h", "**.c", "**/CMakeLists.txt", "**/Makefile", "**.hpp", "**.cmake", ".github/workflows/CBA.yml" ]'
+
   build:
+    needs: skip-duplicates
+    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
 
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-latest    
     steps:
     - name: checkout repository
       uses: actions/checkout@v1

diff --git a/.github/workflows/astyle.yml b/.github/workflows/astyle.yml
@@ -13,6 +13,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
+          cancel_others: 'true'
           paths: '["**.cpp", "**.h", "**.c"]'
   astyle-code:
     name: astyle check

diff --git a/.github/workflows/basic-build.yml b/.github/workflows/basic-build.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   skip-duplicates:
-    continue-on-error: false
+    continue-on-error: true
     runs-on: ubuntu-latest
     # Map a step output to a job output
     outputs:
@@ -19,6 +19,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
+          cancel_others: 'true'
           paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**"]'
   basic-build:
     needs: skip-duplicates

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -4,30 +4,28 @@ on:
   push:
     branches:
     - master
-    - 0.F-dev
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
-    - '**/CMakeLists.txt'
-    - '**/Makefile'
-    - '**.hpp'
-    - '**.cmake'
+
   pull_request:
     branches:
     - master
-    - 0.F-dev
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
-    - '**/CMakeLists.txt'
-    - '**/Makefile'
-    - '**.hpp'
-    - '**.cmake'
 
 jobs:
+  skip-duplicates:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          cancel_others: 'true'
+          paths: '[ "**.cpp", "**.h", "**.c", "**/CMakeLists.txt", "**/Makefile", "**.hpp", "**.cmake" ]'
   build:
+    needs: skip-duplicates
+    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
+
     runs-on: ubuntu-20.04
     env:
         CMAKE: 1

diff --git a/.github/workflows/json.yml b/.github/workflows/json.yml
@@ -4,7 +4,7 @@ on: pull_request
 
 jobs:
   skip-duplicates:
-    continue-on-error: false
+    continue-on-error: true
     runs-on: ubuntu-latest
     # Map a step output to a job output
     outputs:
@@ -13,6 +13,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
+          cancel_others: 'true'
           paths: '["**.json"]'
   style-json:
     name: JSON style check

diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   skip-duplicates:
-    continue-on-error: false
+    continue-on-error: true
     runs-on: ubuntu-latest
     # Map a step output to a job output
     outputs:
@@ -19,6 +19,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
+          cancel_others: 'true'
           paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**"]'
   varied_builds:
     needs: skip-duplicates