File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -13,22 +13,41 @@ permissions:
1313jobs :
1414 create_release_pr :
1515 runs-on : ubuntu-latest
16+
1617 steps :
1718 - name : Checkout master
1819 uses : actions/checkout@v4
1920 with :
2021 ref : master
2122 fetch-depth : 0
2223
23- - name : Create and push release-main
24+ - name : Set up Git
2425 run : |
25- git checkout -b release-main
26- git push -f origin release-main
26+ git config user.name "github-actions"
27+ git config user.email "github-actions@github.com"
28+
29+ - name : Fetch all branches
30+ run : git fetch --all
31+
32+ - name : Create or update release-main from master
33+ run : |
34+ # Check if release-main exists on remote
35+ if git show-ref --quiet refs/remotes/origin/release-main; then
36+ git branch -D release-main || true
37+ git checkout -b release-main origin/release-main
38+ else
39+ git checkout -b release-main
40+ fi
41+
42+ git reset --hard origin/master
43+ git push --force origin release-main
2744
28- - name : Raise PR from release-main to main
45+ - name : Create PR from release-main to main
2946 uses : peter-evans/create-pull-request@v7
3047 with :
3148 base : main
32- title : " Release PR: release-main -> main"
33- body : " This PR merges release-main into main"
49+ branch : release-main
50+ title : " Release PR: release-main → main"
51+ body : |
52+ This PR merges the latest changes from `master` into `main` via `release-main`.
3453 token : ${{ secrets.GITHUB_TOKEN }}
You can’t perform that action at this time.
0 commit comments