Merge pull request #59 from crim-ca/update-ci-no-skip-master

crim-ca · Oct 7, 2024 · fab7dc9 · fab7dc9
2 parents 3bd6a40 + 3270da4
commit fab7dc9
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,24 +15,24 @@ concurrency:
 
 jobs:
   # see: https://github.com/fkirc/skip-duplicate-actions
-#  skip_duplicate:
-#    continue-on-error: true
-#    runs-on: ubuntu-latest
-#    outputs:
-#      should_skip: ${{ steps.skip_check.outputs.should_skip && ! contains(github.ref, 'refs/tags') }}
-#    steps:
-#      - id: skip_check
-#        uses: fkirc/skip-duplicate-actions@master
-#        with:
-#          concurrent_skipping: "same_content"
-#          skip_after_successful_duplicate: "true"
-#          do_not_skip: '["pull_request", "workflow_dispatch", "schedule", "release"]'
+  skip_duplicate:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_duplicate.outputs.should_skip && ! contains(github.ref, 'refs/tags') && ! contains(github.ref, 'refs/heads/master') }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          concurrent_skipping: "same_content_newer"
+          skip_after_successful_duplicate: "true"
+          do_not_skip: '["pull_request", "workflow_dispatch", "schedule", "release"]'
 
   # see: https://github.com/actions/setup-python
   tests:
     # FIXME: https://github.com/fkirc/skip-duplicate-actions/issues/90
-    #needs: skip_duplicate
-    #if: ${{ needs.skip_duplicate.outputs.should_skip != 'true' }}
+    needs: skip_duplicate
+    if: ${{ needs.skip_duplicate.outputs.should_skip != 'true' }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.allow-failure }}
     env: