mirror of
https://github.com/neondatabase/neon.git
synced 2026-05-31 03:50:37 +00:00
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.
This commit is contained in:
2
.github/workflows/pre-merge-checks.yml
vendored
2
.github/workflows/pre-merge-checks.yml
vendored
@@ -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 }}
|
||||
|
||||
Reference in New Issue
Block a user