Skip to content

Commit

Permalink
Attempt using merge into master insted
Browse files Browse the repository at this point in the history
  • Loading branch information
yuval9313 committed Nov 10, 2024
1 parent c669bfc commit bc2b4de
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
ref: bump-version

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

# Avoid caching to be 100% confident things are working properly
- name: Init python poetry action
uses: abatilo/[email protected]
Expand All @@ -40,16 +43,26 @@ jobs:
- name: Build distribution
run: poetry build

- name: Configure git user
run: |
git config --global user.name 'BumpVersion[CI]'
git config --global user.email '[email protected]'
- name: Bump to version
run: poetry run make version version=${{ github.ref_name }}

- name: Commit new version
run: |
git config --global user.name 'BumpVersion[CI]'
git config --global user.email '[email protected]'
git commit -am "Update version to ${{ github.ref_name }}"
git push
- name: Merge into master
run: |
git checkout master
git pull
git merge origin/bump-version
git push
- name: Publish distribution to PyPI
run: |
echo "will publish ${poetry version}"
Expand Down

0 comments on commit bc2b4de

Please sign in to comment.