Skip to content

Commit bc2b4de

Browse files
committed
Attempt using merge into master insted
1 parent c669bfc commit bc2b4de

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

.github/workflows/publish.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
with:
21-
ref: master
21+
fetch-depth: 0
22+
ref: bump-version
23+
2224
- name: Set up Python ${{ matrix.python-version }}
2325
uses: actions/setup-python@v5
2426
with:
2527
python-version: ${{ matrix.python-version }}
28+
2629
# Avoid caching to be 100% confident things are working properly
2730
- name: Init python poetry action
2831
uses: abatilo/[email protected]
@@ -40,16 +43,26 @@ jobs:
4043
- name: Build distribution
4144
run: poetry build
4245

46+
- name: Configure git user
47+
run: |
48+
git config --global user.name 'BumpVersion[CI]'
49+
git config --global user.email '[email protected]'
50+
4351
- name: Bump to version
4452
run: poetry run make version version=${{ github.ref_name }}
4553

4654
- name: Commit new version
4755
run: |
48-
git config --global user.name 'BumpVersion[CI]'
49-
git config --global user.email '[email protected]'
5056
git commit -am "Update version to ${{ github.ref_name }}"
5157
git push
5258
59+
- name: Merge into master
60+
run: |
61+
git checkout master
62+
git pull
63+
git merge origin/bump-version
64+
git push
65+
5366
- name: Publish distribution to PyPI
5467
run: |
5568
echo "will publish ${poetry version}"

0 commit comments

Comments
 (0)