Compare commits

...

5 Commits

View File

@@ -19,6 +19,7 @@ on:
jobs: jobs:
lint: lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.ref_name != 'master'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: psf/black@stable - uses: psf/black@stable
@@ -35,6 +36,7 @@ jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: lint needs: lint
if: github.ref_name != 'master'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-python@v5 - uses: actions/setup-python@v5
@@ -46,7 +48,7 @@ jobs:
tag_and_publish: tag_and_publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.ref_name == 'dev' || github.ref_name == 'master' && github.event_name == 'push' if: github.ref_name == 'dev' || github.ref_name == 'master'
needs: test needs: test
permissions: permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
@@ -89,6 +91,15 @@ jobs:
git tag ${{ steps.git_version.outputs.version }} git tag ${{ steps.git_version.outputs.version }}
git push origin ${{ steps.git_version.outputs.version }} git push origin ${{ steps.git_version.outputs.version }}
- name: Sync tag to dev branch
if: github.ref_name == '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 - name: Set up Python
uses: actions/setup-python@v5 uses: actions/setup-python@v5
with: with: