File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -40,16 +40,16 @@ jobs:
4040 draft : false
4141 prerelease : false
4242
43- - name : Merge release into dev branch
43+ - name : Merge master into dev branch
4444 uses : thomaseizinger/create-pull-request@1.0.0
4545 env :
4646 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
4747 with :
48- head : release/${{ env.RELEASE_VERSION }}
48+ head : master
4949 base : dev
50- title : Merge release ${{ env.RELEASE_VERSION }} into dev branch
50+ title : Merge master into dev branch
5151 body : |
52- This PR merges the release branch for ${{ env.RELEASE_VERSION }} back into dev.
52+ This PR merges the master branch back into dev.
5353 This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the dev branch.
5454
5555 # if needed, you can checkout the latest master here, build artifacts and publish / deploy them somewhere
You can’t perform that action at this time.
0 commit comments