From 2df9e8616fd4874c0ad2c5676710e9c2c838148d Mon Sep 17 00:00:00 2001
From: neuronull <neuronull@pm.me>
Date: Fri, 26 May 2023 11:12:03 -0600
Subject: [PATCH] use head sha not base for merge queue concurrency check

---
 .github/workflows/integration.yml        |  2 +-
 .github/workflows/k8s_e2e.yml            |  2 +-
 .github/workflows/master_merge_queue.yml | 20 +-------------------
 .github/workflows/regression.yml         |  2 +-
 .github/workflows/test.yml               |  2 +-
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index d8ebebfc7f50e..959c43dde7058 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -13,7 +13,7 @@ on:
 
 concurrency:
   # `github.event.number` exists for pull requests, otherwise fall back to SHA for merge queue
-  group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.base_sha }}
+  group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.head_sha }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index 720b46ada5c25..f9360132d71e0 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -26,7 +26,7 @@ on:
     - cron: '0 0 * * 2-6'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.number || github.event.comment.html_url || github.event.merge_group.base_sha || github.event.schedule || github.sha }}
+  group: ${{ github.workflow }}-${{ github.event.number || github.event.comment.html_url || github.event.merge_group.head_sha || github.event.schedule || github.sha }}
 
   cancel-in-progress: true
 
diff --git a/.github/workflows/master_merge_queue.yml b/.github/workflows/master_merge_queue.yml
index 6e38bd7f29a24..eaf5b7bf08295 100644
--- a/.github/workflows/master_merge_queue.yml
+++ b/.github/workflows/master_merge_queue.yml
@@ -21,7 +21,7 @@ on:
 
 concurrency:
   # `github.event.number` exists for pull requests, otherwise fall back to SHA for merge queue
-  group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.base_sha }}
+  group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.head_sha }}
   cancel-in-progress: true
 
 env:
@@ -106,24 +106,6 @@ jobs:
     needs: changes
     secrets: inherit
 
-  # TODO: in a followup PR, run the regression workflow here, as a single reusable workflow.
-  #
-  # NOTE: This design of passing in the pr-number to the Regression workflow requires that the merge queue
-  # be configured contain a maximum of one PR per execution. This is so that the regression report generated
-  # by the workflow can be posted as a comment to the PR.
-  # At a later time, we may want to revisit this in order to allow multiple PRs to be included in a merge
-  # queue execution. At such time, the logic of uploading of the report will need to change to account for
-  # multiple PRs.
-  # regression:
-  #   if: needs.changes.outputs.source == 'true'
-  #   uses: ./.github/workflows/regression.yml
-  #   with:
-  #     pr_number: ${{ needs.changes.outputs.pr-number }}
-  #     base_sha: ${{ github.event.merge_group.base_sha }}
-  #     head_sha: ${{ github.event.merge_group.head_sha }}
-  #   needs: changes
-  #   secrets: inherit
-
   master-merge-queue-check:
     name: Master Merge Queue Suite
     # Always run this so that pull_request triggers are marked as success.
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index 0f9d2ef9f2f81..629ae62c201db 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -34,7 +34,7 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.merge_group.base_sha || github.sha }}
+  group: ${{ github.workflow }}-${{ github.event.merge_group.head_sha || github.sha }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1219da7a73d61..b36aba1f3108d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ on:
 
 concurrency:
   # `github.event.number` exists for pull requests, otherwise fall back to SHA for merge queue
-  group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.base_sha }}
+  group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.head_sha }}
   cancel-in-progress: true
 
 env: