Skip to content

Commit

Permalink
Merge pull request #9 from creyD/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
creyD authored Oct 29, 2024
2 parents 99c84b6 + a6ded91 commit e52a5f4
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
jobs:
lint:
runs-on: ubuntu-latest
if: github.ref_name != 'master'
steps:
- uses: actions/checkout@v4
- uses: psf/black@stable
Expand All @@ -35,6 +36,7 @@ jobs:
test:
runs-on: ubuntu-latest
needs: lint
if: github.ref_name != 'master'
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -46,7 +48,7 @@ jobs:

tag_and_publish:
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
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
Expand Down Expand Up @@ -89,6 +91,15 @@ jobs:
git tag ${{ 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
uses: actions/setup-python@v5
with:
Expand Down

0 comments on commit e52a5f4

Please sign in to comment.