From 8d251e824aac2bd1fbd58461f99f009228c4f51f Mon Sep 17 00:00:00 2001 From: Sam Rowe Date: Thu, 3 Apr 2025 11:47:58 +0100 Subject: [PATCH 1/2] Dev work on tagging releases --- .github/workflows/ci.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9bff66..bf99c88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,8 +32,17 @@ jobs: echo "changed=false" >> $GITHUB_ENV fi - - name: Publish to crates.io - if: env.changed == 'true' - run: cargo publish - env: - CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} + - name: Tag the release + if: github.ref == 'refs/heads/ci_update' + # if: env.changed == 'true' + run: | + version=$(grep '^version\s*=' Cargo.toml | sed -E 's/version[[:space:]]*=[[:space:]]*"(.*)"/\1/') + echo "Version: $version" + # git tag -a v$version -m "Release v$version" + # git push origin v$version + + # - name: Publish to crates.io + # if: env.changed == 'true' + # run: cargo publish + # env: + # CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} From 509b235eb3b9ed2c86012c8661f2f1ba6e4441e1 Mon Sep 17 00:00:00 2001 From: Sam Rowe Date: Thu, 3 Apr 2025 11:52:10 +0100 Subject: [PATCH 2/2] Update CI pipeline --- .github/workflows/ci.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf99c88..71d793f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,8 @@ name: Cargo Build & Test on: push: + branches: + - main pull_request: workflow_dispatch: @@ -33,16 +35,17 @@ jobs: fi - name: Tag the release - if: github.ref == 'refs/heads/ci_update' - # if: env.changed == 'true' + if: github.ref == 'refs/heads/main' && env.changed == 'true' run: | version=$(grep '^version\s*=' Cargo.toml | sed -E 's/version[[:space:]]*=[[:space:]]*"(.*)"/\1/') - echo "Version: $version" - # git tag -a v$version -m "Release v$version" - # git push origin v$version - - # - name: Publish to crates.io - # if: env.changed == 'true' - # run: cargo publish - # env: - # CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} + + echo "Tagging version: $version" + + git tag -a v$version -m "Release v$version" + git push origin v$version + + - name: Publish to crates.io + if: github.ref == 'refs/heads/main' && env.changed == 'true' + run: cargo publish + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}