Skip to content

Commit

Permalink
switch back to tagging with v
Browse files Browse the repository at this point in the history
  • Loading branch information
lilyminium committed Nov 29, 2024
1 parent 939a8ec commit 9d52760
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
branches:
- "package-*"
tags:
- "package-*"
- "v*"
release:
types:
- published
Expand Down Expand Up @@ -58,13 +58,14 @@ jobs:
with:
package-dir: .
env:
CIBW_BEFORE_BUILD: git status
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
CIBW_ARCHS: ${{ matrix.buildplat[2] }}
CIBW_BUILD_VERBOSITY: 1

- name: upload artifacts
if: |
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) ||
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) ||
(github.event_name == 'release' && github.event.action == 'published')
uses: actions/upload-artifact@v3
with:
Expand All @@ -90,7 +91,7 @@ jobs:

- name: upload artifacts
if: |
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) ||
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) ||
(github.event_name == 'release' && github.event.action == 'published')
uses: actions/upload-artifact@v3
with:
Expand All @@ -100,7 +101,7 @@ jobs:
upload_testpypi_lipyds:
if: |
github.repository == 'lilyminium/lipyds' &&
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package'))
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v'))
name: testpypi_upload_lipyds
environment:
name: deploy
Expand Down Expand Up @@ -145,7 +146,7 @@ jobs:
check_testpypi:
if: |
github.repository == 'lilyminium/lipyds' &&
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package'))
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v'))
name: testpypi check
runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ wheels/
*.egg
*.cpp
*.xtc_offsets.npz
wheelhouse/

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down
5 changes: 1 addition & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ testpaths = [

[tool.versioningit.vcs]
method = "git"
match = ["package-*"]
match = ["v*"]
default-tag = "0.0.0"

[tool.versioningit.format]
Expand All @@ -62,6 +62,3 @@ distance-dirty = "{base_version}+{distance}.{vcs}{rev}.dirty"

[tool.versioningit.write]
file = "lipyds/_version.py"

[tool.versioningit.tag2version]
rmprefix = "package-"

0 comments on commit 9d52760

Please sign in to comment.