From 4e6250ab4ee3c0d1f57028bcb887f1b2c86ceef2 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Sat, 9 Aug 2025 20:01:48 +0200 Subject: [PATCH 1/2] Fix up release workflow --- .github/workflows/bump.yaml | 8 ++++---- .github/workflows/release.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bump.yaml b/.github/workflows/bump.yaml index 653be77..b52d7ad 100644 --- a/.github/workflows/bump.yaml +++ b/.github/workflows/bump.yaml @@ -46,13 +46,13 @@ jobs: git config --global user.name "$GITHUB_ACTOR" git config --global user.email "$CI_COMMIT_EMAIL" - BASE_VERSION=`sed -ne 's/^version = "\([0-9\.a]*\)"/\1/p' pyproject.toml` + BASE_VERSION=`sed -ne 's/^version = "\([0-9\.post]*\)"/\1/p' pyproject.toml` echo "Bumping from version $BASE_VERSION" # Bump uv version --bump ${{ github.event.inputs.bump_rule }} - NEW_VERSION=`sed -ne 's/^version = "\([0-9\.a]*\)"/\1/p' pyproject.toml` + NEW_VERSION=`sed -ne 's/^version = "\([0-9\.]*\)"/\1/p' pyproject.toml` echo "Bumping to version $NEW_VERSION" # Build CHANGELOG @@ -65,12 +65,12 @@ jobs: # Bump to alpha (so that future commits do not have the same # version as the tagged commit) - BASE_VERSION=`sed -ne 's/^version = "\([0-9\.a]*\)"/\1/p' pyproject.toml` + BASE_VERSION=`sed -ne 's/^version = "\([0-9\.]*\)"/\1/p' pyproject.toml` # Bump to pre-release of next version uv version --bump post - NEW_VERSION=`sed -ne 's/^version = "\([0-9\.a]*\)"/\1/p' pyproject.toml` + NEW_VERSION=`sed -ne 's/^version = "\([0-9\.post]*\)"/\1/p' pyproject.toml` echo "Bumping version $BASE_VERSION > $NEW_VERSION" # Commit and push diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ebd842a..2b5a421 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ "ubuntu-latest" ] - python-version: [ "3.9" ] + python-version: [ "3.11" ] runs-on: "${{ matrix.os }}" steps: - name: Check out repository @@ -29,7 +29,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Add version to environment run: | - PROJECT_VERSION=`sed -ne 's/^version = "\([0-9\.a]*\)"/\1/p' pyproject.toml` + PROJECT_VERSION=`sed -ne 's/^version = "\([0-9\.]*\)"/\1/p' pyproject.toml` echo "PROJECT_VERSION=$PROJECT_VERSION" >> $GITHUB_ENV - name: Build package for PyPI run: | From 192500cef78b5a297ae06bef5043f0b8920302ab Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Sat, 9 Aug 2025 20:02:23 +0200 Subject: [PATCH 2/2] CHANGELOG --- changelog/32.trivial.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/32.trivial.md diff --git a/changelog/32.trivial.md b/changelog/32.trivial.md new file mode 100644 index 0000000..a4b51ec --- /dev/null +++ b/changelog/32.trivial.md @@ -0,0 +1 @@ +Fix release workflow after updating to uv build backend