Fix nightly (rerun-io#5970)

### What - Closes rerun-io#5945 Concurrency was setup incorrectly, causing all the build jobs to be cancelled. ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested the web demo (if applicable): * Using examples from latest `main` build: [rerun.io/viewer](https://rerun.io/viewer/pr/{{pr.number}}?manifest_url=https://app.rerun.io/version/main/examples_manifest.json) * Using full set of examples from `nightly` build: [rerun.io/viewer](https://rerun.io/viewer/pr/{{pr.number}}?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG * [x] If applicable, add a new check to the [release checklist](https://github.com/rerun-io/rerun/blob/main/tests/python/release_checklist)! - [PR Build Summary](https://build.rerun.io/pr/{{ pr.number }}) - [Recent benchmark results](https://build.rerun.io/graphs/crates.html) - [Wasm size tracking](https://build.rerun.io/graphs/sizes.html) To run all checks from `main`, comment on the PR with `@rerun-bot full-check`.
m-decoster · Apr 15, 2024 · 0e4b213 · 0e4b213
1 parent e8d39d7
commit 0e4b213
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 22 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -79,7 +79,7 @@ jobs:
     name: "Linux-arm64: Build & Upload Wheels"
     uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-linux-arm64
       PLATFORM: linux-arm64
       WHEEL_ARTIFACT_NAME: linux-arm64-wheel
       MODE: "pypi"
@@ -90,7 +90,7 @@ jobs:
     name: "Linux-x64: Build & Upload Wheels"
     uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-linux-x64
       PLATFORM: linux-x64
       WHEEL_ARTIFACT_NAME: linux-x64-wheel
       MODE: "pypi"
@@ -101,7 +101,7 @@ jobs:
     name: "Macos-arm64: Build & Upload Wheels"
     uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-macos-arm64
       PLATFORM: macos-arm64
       WHEEL_ARTIFACT_NAME: macos-arm64-wheel
       MODE: "pypi"
@@ -112,7 +112,7 @@ jobs:
     name: "Macos-x64: Build & Upload Wheels"
     uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-macos-x64
       PLATFORM: macos-x64
       WHEEL_ARTIFACT_NAME: "macos-x64-wheel"
       MODE: "pypi"
@@ -123,7 +123,7 @@ jobs:
     name: "Windows-x64: Build & Upload Wheels"
     uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-windows-x64
       PLATFORM: windows-x64
       WHEEL_ARTIFACT_NAME: windows-x64-wheel
       MODE: "pypi"
@@ -137,7 +137,7 @@ jobs:
     name: "linux-arm64: Test Wheels"
     uses: ./.github/workflows/reusable_test_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-linux-arm64
       PLATFORM: linux-arm64
       WHEEL_ARTIFACT_NAME: linux-arm64-wheel
     secrets: inherit
@@ -147,7 +147,7 @@ jobs:
     name: "Linux-x64: Test Wheels"
     uses: ./.github/workflows/reusable_test_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-linux-x64
       PLATFORM: linux-x64
       WHEEL_ARTIFACT_NAME: linux-x64-wheel
     secrets: inherit
@@ -157,7 +157,7 @@ jobs:
     name: "macos-arm64: Test Wheels"
     uses: ./.github/workflows/reusable_test_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-macos-arm64
       PLATFORM: macos-arm64
       WHEEL_ARTIFACT_NAME: macos-arm64-wheel
     secrets: inherit
@@ -167,7 +167,7 @@ jobs:
     name: "macos-x64: Test Wheels"
     uses: ./.github/workflows/reusable_test_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-macos-x64
       PLATFORM: macos-x64
       WHEEL_ARTIFACT_NAME: macos-x64-wheel
     secrets: inherit
@@ -177,7 +177,7 @@ jobs:
     name: "Windows-x64: Test Wheels"
     uses: ./.github/workflows/reusable_test_wheels.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-windows-x64
       PLATFORM: windows-x64
       WHEEL_ARTIFACT_NAME: windows-x64-wheel
     secrets: inherit
@@ -190,7 +190,7 @@ jobs:
     name: "Linux-Arm64: Build & Upload rerun_c"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-linux-arm64
       PLATFORM: linux-arm64
     secrets: inherit
 
@@ -199,7 +199,7 @@ jobs:
     name: "Linux-x64: Build & Upload rerun_c"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-linux-x64
       PLATFORM: linux-x64
     secrets: inherit
 
@@ -208,7 +208,7 @@ jobs:
     name: "Mac-Intel: Build & Upload rerun_c"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-macos-x64
       PLATFORM: macos-x64
     secrets: inherit
 
@@ -217,7 +217,7 @@ jobs:
     name: "Mac-Arm64: Build & Upload rerun_c"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-macos-arm64
       PLATFORM: macos-arm64
     secrets: inherit
 
@@ -226,7 +226,7 @@ jobs:
     name: "Windows-x64: Build & Upload rerun_c"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-windows-x64
       PLATFORM: windows-x64
     secrets: inherit
 
@@ -239,7 +239,7 @@ jobs:
     name: "Linux-arm64: Build & Upload rerun-cli"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-linux-arm64
       PLATFORM: linux-arm64
     secrets: inherit
 
@@ -248,7 +248,7 @@ jobs:
     name: "Linux-x64: Build & Upload rerun-cli"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-linux-x64
       PLATFORM: linux-x64
     secrets: inherit
 
@@ -257,7 +257,7 @@ jobs:
     name: "Mac-x64: Build & Upload rerun-cli"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-macos-x64
       PLATFORM: macos-x64
     secrets: inherit
 
@@ -266,7 +266,7 @@ jobs:
     name: "Mac-arm64: Build & Upload rerun-cli"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-macos-arm64
       PLATFORM: macos-arm64
     secrets: inherit
 
@@ -275,7 +275,7 @@ jobs:
     name: "Windows-x64: Build & Upload rerun-cli"
     uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
     with:
-      CONCURRENCY: nightly
+      CONCURRENCY: nightly-windows-x64
       PLATFORM: windows-x64
     secrets: inherit
 
@@ -348,11 +348,13 @@ jobs:
         build-rerun_c-and-upload-windows-x64,
       ]
     uses: ./.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml
+    with:
+      CONCURRENCY: nightly
     secrets: inherit
 
   pre-release:
     name: Pre Release
-    concurrency: NIGHTLY
+    concurrency: nightly
     needs:
       [
         build-rerun-cli-and-upload-linux-arm64,

diff --git a/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml b/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml
@@ -3,6 +3,9 @@ name: Reusable C++ bundling and upload
 on:
   workflow_call:
     inputs:
+      CONCURRENCY:
+        required: true
+        type: string
       PLATFORM_FILTER:
         required: false
         type: string
@@ -11,6 +14,10 @@ on:
         type: string
         default: ""
 
+concurrency:
+  group: ${{ inputs.CONCURRENCY }}-bundle-and-upload-rerun-cpp
+  cancel-in-progress: true
+
 jobs:
   bundle-and-upload-rerun_cpp:
     name: Bundle and upload rerun_cpp_sdk.zip

diff --git a/.github/workflows/reusable_publish_rerun_c.yml b/.github/workflows/reusable_publish_rerun_c.yml
@@ -66,5 +66,6 @@ jobs:
     needs: [linux-arm64, linux-x64, macos-x64, macos-arm64, windows-x64]
     uses: ./.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml
     with:
+      CONCURRENCY: bundle-rerun-c-${{ github.ref_name }}
       RELEASE_COMMIT: ${{ inputs.release-commit }}
     secrets: inherit
diff --git a/.github/workflows/reusable_test_wheels.yml b/.github/workflows/reusable_test_wheels.yml
@@ -23,7 +23,7 @@ on:
         default: false
 
 concurrency:
-  group: ${{ inputs.CONCURRENCY }}-build-wheels
+  group: ${{ inputs.CONCURRENCY }}-test-wheels
   cancel-in-progress: true
 
 env: