|
18 | 18 | - name: Checkout master branch |
19 | 19 | uses: actions/checkout@v4 |
20 | 20 | with: |
21 | | - ref: master |
22 | 21 | fetch-depth: 0 |
23 | 22 |
|
24 | | - # - name: Create and push to main |
25 | | - # run: | |
26 | | - # git checkout -b main |
27 | | - # git push origin main |
28 | | - |
29 | | - - name: Create and push to feature branch |
30 | | - run: | |
31 | | - git checkout -b release-main |
32 | | - git push origin release-main |
33 | | -
|
34 | | - - name: Raise PR from release-main to main |
35 | | - uses: peter-evans/create-pull-request@v5 |
36 | | - with: |
37 | | - base: main |
38 | | - head: release-main |
39 | | - title: "Automated Release PR: release-main -> main" |
40 | | - body: "This PR contains the automated changes for the release process." |
41 | | - branch: pr-release-main-to-main |
42 | | - |
43 | | - - name: Checkout release branch |
44 | | - # run: git checkout main |
45 | | - run: git checkout release-main |
46 | | - |
47 | 23 | - name: Set up Python |
48 | 24 | uses: actions/setup-python@v3 |
49 | 25 | with: |
@@ -72,11 +48,11 @@ jobs: |
72 | 48 | TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} |
73 | 49 | run: twine upload dist/* |
74 | 50 |
|
75 | | - - name: Raise PR from main to master |
| 51 | + - name: Raise PR from master to main |
76 | 52 | uses: peter-evans/create-pull-request@v5 |
77 | 53 | with: |
78 | | - base: master |
79 | | - head: main |
80 | | - title: "Release PR: main -> master" |
81 | | - body: "This PR merges the changes from the main branch back into master after the release." |
82 | | - branch: pr-main-to-master |
| 54 | + base: main |
| 55 | + head: master |
| 56 | + title: "Release PR: master -> main" |
| 57 | + body: "This PR merges the changes from the master branch into main after the release." |
| 58 | + branch: pr-master-to-main |
0 commit comments