From fdf04d4d81f38b3e4901b118af92974de9709f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JC=20Gr=C3=BCnhage?= Date: Mon, 17 Mar 2025 10:26:45 +0100 Subject: [PATCH] fix(ci): use correct branch ref for checking whether this is a release merge queue (#11270) ## Problem https://github.com/neondatabase/neon/actions/runs/13894288475/job/38871819190 shows the "Add fast-fordward label to PR to trigger fast-forward merge" job being skipped. This is due to not using the right variable for checking which branch the merge queue is merging into. ## Summary of changes Use the `branch` output of the `meta` task for checking the target branch of a merge group. --- .github/workflows/pre-merge-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge-checks.yml b/.github/workflows/pre-merge-checks.yml index 9e5c3df52c..3bd81f6538 100644 --- a/.github/workflows/pre-merge-checks.yml +++ b/.github/workflows/pre-merge-checks.yml @@ -148,7 +148,7 @@ jobs: ${{ always() && github.event_name == 'merge_group' - && contains(fromJson('["release", "release-proxy", "release-compute"]'), github.base_ref) + && contains(fromJson('["release", "release-proxy", "release-compute"]'), needs.meta.outputs.branch) }} env: GH_TOKEN: ${{ secrets.CI_ACCESS_TOKEN }}