Skip to content

Commit

Permalink
Merge pull request #11 from creyD/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
creyD authored Oct 29, 2024
2 parents 26e18f6 + eb89539 commit 974bc59
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ on:
jobs:
lint:
runs-on: ubuntu-latest
if: github.ref_name != 'master'
steps:
- uses: actions/checkout@v4
- uses: psf/black@stable
Expand All @@ -35,7 +34,6 @@ 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 @@ -47,7 +45,7 @@ jobs:

tag_and_publish:
runs-on: ubuntu-latest
if: github.ref == 'master' || github.ref == 'dev'
if: github.ref_name == 'master' || github.ref_name == 'dev'
needs: test
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
Expand All @@ -57,7 +55,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-tags: true
ref: ${{ github.ref }}
ref: ${{ github.ref_name }}
fetch-depth: 0

- name: setup git
Expand All @@ -68,7 +66,7 @@ jobs:
- name: set version format
id: version_format
run: |
if [[ ${{ github.ref }} == 'master' ]]; then
if [[ ${{ github.ref_name }} == 'master' ]]; then
echo "version_format=\${major}.\${minor}.\${patch}" >> $GITHUB_OUTPUT
else
echo "version_format=\${major}.\${minor}.\${patch}rc\${increment}" >> $GITHUB_OUTPUT
Expand Down

0 comments on commit 974bc59

Please sign in to comment.