File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -387,18 +387,18 @@ jobs:
387
387
git fetch --tags
388
388
echo "PREVERSION=$(git describe --tags --abbrev=0 HEAD)" >> $GITHUB_ENV
389
389
390
- - name : Merge Alpha branch into Meta
390
+ - name : Force push Alpha branch to Meta
391
391
run : |
392
392
git config --global user.email "github-actions[bot]@users.noreply.github.com"
393
393
git config --global user.name "github-actions[bot]"
394
394
git fetch origin Alpha:Alpha
395
- git merge Alpha
396
- git push origin Meta
395
+ git push origin Alpha:Meta --force
397
396
env :
398
397
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
399
398
400
- - name : Tag the commit
399
+ - name : Tag the commit on Alpha
401
400
run : |
401
+ git checkout Alpha
402
402
git tag ${{ github.event.inputs.version }}
403
403
git push origin ${{ github.event.inputs.version }}
404
404
env :
You can’t perform that action at this time.
0 commit comments