diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 25ed0e2..33caec9 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,9 +1,8 @@ [bumpversion] -parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-beta(?P\d+))? +parse = (?P\d+)\.(?P\d+)\.(?P\d+)(b(?P\d+))? serialize = - {major}.{minor}.{patch}-beta{beta} + {major}.{minor}.{patch}b{beta} {major}.{minor}.{patch} -current_version = 2.0.0-toto1 [bumpversion:file:pyproject.toml] diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index dce24df..4787ed7 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -4,7 +4,7 @@ on: push: tags: - '[0-9]+.[0-9]+.[0-9]+' - - '[0-9]+.[0-9]+.[0-9]+-beta[0-9]+' + - '[0-9]+.[0-9]+.[0-9]+b[0-9]+' jobs: @@ -27,7 +27,7 @@ jobs: name: Release ${{ github.ref_name }} generateReleaseNotes: true draft: false - prerelease: contains(${{ github.ref_name }},'beta') + prerelease: contains(${{ github.ref_name }},'b') build_and_test: @@ -158,7 +158,7 @@ jobs: commit_documentation: name: Add documentation and unit tests results into gh-pages branch needs: build_and_test - if: "!(contains(${{ github.ref_name }},'beta'))&&(needs.create_release.outputs.job_status=='success')&&(needs.build_and_test.outputs.job_status=='success')" + if: "!(contains(${{ github.ref_name }},'b'))&&(needs.create_release.outputs.job_status=='success')&&(needs.build_and_test.outputs.job_status=='success')" runs-on: ubuntu-latest steps: