Try making pull-request workflows non-concurrent (#1970)

* Try making pull-request workflows non-concurrent

* Concurrency groups for push_main as well

* Each sub-workflow needs its own name or they fight

.github/workflows/on_pull_request.yml

@@ -6,17 +6,15 @@ on:
       - opened
       - synchronize
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 # These jobs use fairly short names as they are a prefix in the display hierarchy
 jobs:
   checks:
     name: Checks
     uses: ./.github/workflows/reusable_checks.yml
     secrets: inherit
-
+    concurrency:
+      group: pr-checks-${{ github.event.pull_request.number }}
+      cancel-in-progress: true
 
   min-test-wheel:
     name: 'Minimum Wheel'
@@ -28,11 +26,17 @@ jobs:
       WHEEL_ARTIFACT_NAME: '' # the min-test wheel isn't used for anything
       RRD_ARTIFACT_NAME: linux-rrd-fast
     secrets: inherit
+    concurrency:
+      group: pr-min-test-wheel-${{ github.event.pull_request.number }}
+      cancel-in-progress: true
 
   build-web:
     name: 'Build Web'
     uses: ./.github/workflows/reusable_build_web.yml
     secrets: inherit
+    concurrency:
+      group: pr-build-web-${{ github.event.pull_request.number }}
+      cancel-in-progress: true
 
   upload-web:
     name: 'Upload Web'
@@ -42,6 +46,9 @@ jobs:
       RRD_ARTIFACT_NAME: linux-rrd-fast
       UPLOAD_COMMIT_OVERRIDE: ${{ github.event.pull_request.head.sha }}
     secrets: inherit
+    concurrency:
+      group: pr-upload-web-${{ github.event.pull_request.number }}
+      cancel-in-progress: true
 
   save-pr-summary:
     name: 'Save PR Summary'
@@ -50,3 +57,6 @@ jobs:
     with:
       PR_NUMBER: ${{ github.event.pull_request.number }}
     secrets: inherit
+    concurrency:
+      group: pr-save-pr-${{ github.event.pull_request.number }}
+      cancel-in-progress: true

.github/workflows/on_push_main.yml

@@ -5,15 +5,14 @@ on:
     branches:
       - "main"
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   checks:
     name: Checks
     uses: ./.github/workflows/reusable_checks.yml
     secrets: inherit
+    concurrency:
+      group: push-checks-${{ github.ref_name }}
+      cancel-in-progress: true
 
   benches:
     name: Benchmarks
@@ -23,6 +22,9 @@ jobs:
       BENCH_NAME: main
       COMPARE_TO: main
     secrets: inherit
+    concurrency:
+      group: push-benches-${{ github.ref_name }}
+      cancel-in-progress: true
 
   deploy-docs:
     needs: [checks, benches]
@@ -32,11 +34,17 @@ jobs:
       PY_DOCS_VERSION_NAME: "HEAD"
       UPDATE_LATEST: false
     secrets: inherit
+    concurrency:
+      group: push-deploy-docs-${{ github.ref_name }}
+      cancel-in-progress: true
 
   build-web:
     name: 'Build Web'
     uses: ./.github/workflows/reusable_build_web.yml
     secrets: inherit
+    concurrency:
+      group: push-build-web-${{ github.ref_name }}
+      cancel-in-progress: true
 
   upload-web:
     name: 'Upload Web'
@@ -46,6 +54,9 @@ jobs:
       RRD_ARTIFACT_NAME: linux-rrd
       MARK_PRERELEASE_FOR_MAINLINE: true
     secrets: inherit
+    concurrency:
+      group: push-upload-web-${{ github.ref_name }}
+      cancel-in-progress: true
 
   build-linux:
     needs: [checks]
@@ -56,6 +67,9 @@ jobs:
       WHEEL_ARTIFACT_NAME: linux-wheel
       RRD_ARTIFACT_NAME: linux-rrd
     secrets: inherit
+    concurrency:
+      group: push-build-linux-${{ github.ref_name }}
+      cancel-in-progress: true
 
   build-windows:
     needs: [checks]
@@ -66,6 +80,9 @@ jobs:
       WHEEL_ARTIFACT_NAME: windows-wheel
       RRD_ARTIFACT_NAME: ''
     secrets: inherit
+    concurrency:
+      group: push-build-windows-${{ github.ref_name }}
+      cancel-in-progress: true
 
   build-macos-arm:
     needs: [checks]
@@ -76,6 +93,9 @@ jobs:
       WHEEL_ARTIFACT_NAME: macos-arm-wheel
       RRD_ARTIFACT_NAME: ''
     secrets: inherit
+    concurrency:
+      group: push-build-macos-arm-${{ github.ref_name }}
+      cancel-in-progress: true
 
   build-macos-intel:
     needs: [checks]
@@ -86,6 +106,9 @@ jobs:
       WHEEL_ARTIFACT_NAME: 'macos-intel-wheel'
       RRD_ARTIFACT_NAME: ''
     secrets: inherit
+    concurrency:
+      group: push-build-macos-intel-${{ github.ref_name }}
+      cancel-in-progress: true
 
   upload-wheels-linux:
     name: 'Linux: Upload Wheels'
@@ -95,6 +118,9 @@ jobs:
       WHEEL_ARTIFACT_NAME: linux-wheel
       RRD_ARTIFACT_NAME: linux-rrd
     secrets: inherit
+    concurrency:
+      group: push-upload-wheels-linux-${{ github.ref_name }}
+      cancel-in-progress: true
 
   upload-wheels-windows:
     name: 'Windows: Upload Wheels'
@@ -104,6 +130,9 @@ jobs:
       WHEEL_ARTIFACT_NAME: windows-wheel
       RRD_ARTIFACT_NAME: linux-rrd
     secrets: inherit
+    concurrency:
+      group: push-upload-wheels-windows-${{ github.ref_name }}
+      cancel-in-progress: true
 
   upload-wheels-macos-arm:
     name: 'Macos-Arm: Upload Wheels'
@@ -113,6 +142,9 @@ jobs:
       WHEEL_ARTIFACT_NAME: macos-arm-wheel
       RRD_ARTIFACT_NAME: linux-rrd
     secrets: inherit
+    concurrency:
+      group: push-upload-wheels-macos-arm-${{ github.ref_name }}
+      cancel-in-progress: true
 
   upload-wheels-macos-intel:
     name: 'Macos-Intel: Upload Wheels'
@@ -122,15 +154,24 @@ jobs:
       WHEEL_ARTIFACT_NAME: macos-intel-wheel
       RRD_ARTIFACT_NAME: linux-rrd
     secrets: inherit
+    concurrency:
+      group: push-upload-wheels-macos-intel-${{ github.ref_name }}
+      cancel-in-progress: true
 
   generate-pip-index:
     name: 'Generate Pip Index'
     needs: [upload-wheels-linux, upload-wheels-windows, upload-wheels-macos-arm, upload-wheels-macos-intel]
     uses: ./.github/workflows/reusable_pip_index.yml
     secrets: inherit
+    concurrency:
+      group: push-generate-pip-index-${{ github.ref_name }}
+      cancel-in-progress: true
 
   pre-release:
     name: Pre Release
+    concurrency:
+      group: push-prerelease-${{ github.ref_name }}
+      cancel-in-progress: true
     needs: [upload-web, generate-pip-index]
     runs-on: "ubuntu-latest"
     steps: