Skip to content

Commit aed95e6

Browse files
fix: update workflow.yml to raise PR to main from master
1 parent daea6bf commit aed95e6

File tree

1 file changed

+6
-30
lines changed

1 file changed

+6
-30
lines changed

.github/workflows/workflow.yml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,8 @@ jobs:
1818
- name: Checkout master branch
1919
uses: actions/checkout@v4
2020
with:
21-
ref: master
2221
fetch-depth: 0
2322

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-
4723
- name: Set up Python
4824
uses: actions/setup-python@v3
4925
with:
@@ -72,11 +48,11 @@ jobs:
7248
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
7349
run: twine upload dist/*
7450

75-
- name: Raise PR from main to master
51+
- name: Raise PR from master to main
7652
uses: peter-evans/create-pull-request@v5
7753
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

Comments
 (0)