From e750e6bef1d0b6f8efb101c0df9b3529a9d65efc Mon Sep 17 00:00:00 2001
From: Derek Roberts <derek.roberts@gmail.com>
Date: Wed, 6 Dec 2023 19:27:11 -0800
Subject: [PATCH] ci: avoid collisions with merge group SHAs (#1713)

---
 .github/workflows/pr-open.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 845aa6109..f017e1c70 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -6,8 +6,8 @@ on:
 
 concurrency:
   # Cancel in progress for PR open and close, but not merge_group
-  group: ${{ github.workflow }}-${{ github.event.number }}
-  cancel-in-progress: ${{ !github.event.number && false || true }}
+  group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.base_sha }}
+  cancel-in-progress: true
 
 jobs:
   # PR only, skip for merge_group