Use workflow concurrency instead of skipping action

Author: dolfinus

.github/workflows/codeql-analysis.yml

@@ -35,8 +35,10 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }}
           ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-${{ matrix.python-version }}-release-${{ hashFiles('requirements*.txt') }}
           ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-
           ${{ runner.os }}-python-${{ matrix.python-version }}-tests-
+          ${{ runner.os }}-python-${{ matrix.python-version }}-release-
           ${{ runner.os }}-python
           ${{ runner.os }}-
 

.github/workflows/release.yml

@@ -6,8 +6,7 @@ on:
     - v*
 
 jobs:
-
-  wait:
+  wait-tests:
     name: Wait for tests
     runs-on: ubuntu-latest
 
@@ -24,10 +23,27 @@ jobs:
       uses: cutenode/action-always-fail@v1
       if: steps.wait-for-tests.outputs.conclusion != 'success'
 
+  wait-codeql:
+    name: Wait for CodeQL
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: fountainhead/[email protected]
+      id: wait-for-codeql
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        checkName: Analyze
+        ref: ${{ github.sha }}
+        timeoutSeconds: 3600
+
+    - name: Fail the Build
+      uses: cutenode/action-always-fail@v1
+      if: steps.wait-for-codeql.outputs.conclusion != 'success'
+
   release:
     name: Release package
     runs-on: ubuntu-latest
-    needs: [wait]
+    needs: [wait-tests, wait-codeql]
 
     steps:
     - name: Checkout code
@@ -44,10 +60,14 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-python-3.10-pip-${{ hashFiles('requirements.txt') }}
+        key: ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }}
         restore-keys: |
-          ${{ runner.os }}-python-3.10-pip-${{ hashFiles('requirements.txt') }}
-          ${{ runner.os }}-python-3.10-pip-
+          ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-3.10-tests-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-3.10-codeql-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-3.10-release-
+          ${{ runner.os }}-python-3.10-tests-
+          ${{ runner.os }}-python-3.10-codeql-
           ${{ runner.os }}-python
           ${{ runner.os }}-
 

.github/workflows/test.yml

@@ -8,29 +8,14 @@ on:
     branches:
     - master
 
-jobs:
-  check_duplicate_runs:
-    name: Check for duplicate runs
-    continue-on-error: true
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-    - id: skip_check
-      uses: fkirc/skip-duplicate-actions@v5
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        concurrent_skipping: same_content_newer
-        cancel_others: true
-        skip_after_successful_duplicate: false
-        paths_ignore: '["**/README.md", "**/LICENSE"]'
-        do_not_skip: '["push"]'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   tests:
     name: Run ${{ matrix.mark}} tests (${{ matrix.python-version }} on ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
-    needs: [check_duplicate_runs]
-    if: ${{ needs.check_duplicate_runs.outputs.should_skip != 'true' }}
     strategy:
       fail-fast: false
       matrix:
@@ -69,8 +54,10 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }}
           ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-${{ matrix.python-version }}-release-${{ hashFiles('requirements*.txt') }}
           ${{ runner.os }}-python-${{ matrix.python-version }}-tests-
           ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-
+          ${{ runner.os }}-python-${{ matrix.python-version }}-release-
           ${{ runner.os }}-python
           ${{ runner.os }}-