mirror of
https://github.com/clockworklabs/SpacetimeDB.git
synced 2026-05-14 11:48:28 -04:00
7c4c3ddeea
# Description of Changes The merge queue was (partly) getting borked because we were putting all non-PR CI events into the same concurrency group, which meant they all non-PR CI jobs would run sequentially instead of running in parallel. This sometimes caused _painfully_ long delays in the merge queue. This was due to my misunderstanding in https://github.com/clockworklabs/SpacetimeDB/pull/3501#discussion_r2466570395, where I didn't realize that `cancel-in-progress: false` would cause everything to queue up. Now, for non-PR events, we append the commit SHA to the concurrency group. For merge queue events, this should be the SHA of the ephemeral merge commit that GH creates, so it will never conflict. For push events or manual workflow dispatch events, the SHA should be a sane way to recognize/cancel redundant events. # API and ABI breaking changes None. CI-only change. # Expected complexity level and risk 1 # Testing - [x] PR CI passes on this PR - [x] PR CI is still canceled on this PR if a new commit is pushed Unfortunately it's hard to test the behavior for non-PR events without merging and seeing if it works. --------- Co-authored-by: Zeke Foppa <bfops@users.noreply.github.com>