File tree Expand file tree Collapse file tree 2 files changed +6
-29
lines changed
Expand file tree Collapse file tree 2 files changed +6
-29
lines changed Original file line number Diff line number Diff line change @@ -192,6 +192,8 @@ jobs:
192192 pull-requests : write
193193 if : needs.state.outputs.merge == 'true'
194194 runs-on : ubuntu-latest
195+ env :
196+ MERGE_BRANCH : merge/${{ github.ref_name }}
195197 steps :
196198 - uses : actions/checkout@v3
197199 with :
@@ -200,15 +202,17 @@ jobs:
200202 uses : ./.github/actions/setup
201203 - run : bash scripts/git-user-config.sh
202204 - name : Create branch to merge
203- run : bash scripts/release/workflow/prepare-release-merge.sh
205+ run : |
206+ git checkout -B "$MERGE_BRANCH" "$GITHUB_REF_NAME"
207+ git push -f origin "$MERGE_BRANCH"
204208 - name : Create PR back to master
205209 uses : actions/github-script@v6
206210 with :
207211 script : |
208212 await github.rest.pulls.create({
209213 owner: context.repo.owner,
210214 repo: context.repo.repo,
211- head: 'merge/${{ github.ref_name }}' ,
215+ head: process.env.MERGE_BRANCH ,
212216 base: 'master',
213217 title: '${{ format('Merge {0} branch', github.ref_name) }}'
214218 });
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments