Compare commits

..

1 Commits

Author SHA1 Message Date
99c84b676c Merge pull request #8 from creyD/dev 2024-10-29 15:09:34 +01:00

View File

@@ -12,6 +12,7 @@ on:
- "**/CHANGELOG.md"
pull_request:
branches:
- master
- dev
workflow_dispatch:
@@ -45,7 +46,7 @@ jobs:
tag_and_publish:
runs-on: ubuntu-latest
if: github.ref_name == 'master' || github.ref_name == 'dev'
if: github.ref_name == 'dev' || github.ref_name == 'master' && github.event_name == 'push'
needs: test
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
@@ -83,19 +84,11 @@ jobs:
version_format: ${{ steps.version_format.outputs.version_format }}
- name: Create & Push Tag
if: github.ref_name == 'master' || github.ref_name == 'dev'
run: |
git tag ${{ steps.git_version.outputs.version }}
git push origin ${{ steps.git_version.outputs.version }}
- name: Sync tag to dev branch
if: github.ref == 'master'
run: |
git fetch origin dev
git checkout dev
git merge --no-ff ${{ steps.git_version.outputs.version }}
git push origin dev
git checkout master
- name: Set up Python
uses: actions/setup-python@v5
with: