Merge remote-tracking branch 'upstream/main' into grpc-health-probe-0…

….4.34
deephaven · Oct 8, 2024 · 6bd0b5e · 6bd0b5e
2 parents 548f57d + 5b5ffab
commit 6bd0b5e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
@@ -13,9 +13,6 @@ on:
         description: 'The bake target(s), comma separated. Please ask for assistance.'
         required: true
 
-# For maximum cache coherency, ensure only one outstanding build at any given time
-concurrency: release
-
 jobs:
   assemble-deephaven-core:
     runs-on: ubuntu-24.04

diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml
@@ -9,8 +9,9 @@ on:
     branches: [main]
   workflow_dispatch:
 
-# For maximum cache coherency, ensure only one outstanding build at any given time
-concurrency: release
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   assemble-deephaven-core:

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -6,8 +6,9 @@ on:
   push:
     branches: ["main", "release/v*"]
 
-# For maximum cache coherency, ensure only one outstanding build at any given time
-concurrency: release
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build: