From 3557fae57c3fecd295f2306a8b0bcc564930ed2f Mon Sep 17 00:00:00 2001 From: KC Berg Date: Tue, 8 Jul 2025 17:01:41 -0600 Subject: [PATCH 1/4] chore: remove old publish workflows, unify under release workflow --- .github/workflows/release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b507773..b01f902 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,10 +76,6 @@ jobs: run: | git config user.name "HawkyMcBuilderFace[bot]" git config user.email "222944+HawkyMcBuilderFace[bot]@users.noreply.github.com" - - name: Set version from tag - run: | - TAG_NAME=${GITHUB_REF#refs/tags/v} - bumpver update --set-version $TAG_NAME --commit - name: Build package run: | python -m build From c2fdc6f0400cd86e72bd9aab90b4ff594f699667 Mon Sep 17 00:00:00 2001 From: KC Berg Date: Tue, 8 Jul 2025 17:09:18 -0600 Subject: [PATCH 2/4] chore: remove obsolete publish workflow files from local filesystem --- .github/workflows/release.yml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b01f902..bdf2c94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,26 +30,11 @@ jobs: mode: issue fail-on-denial: true - tag: - name: Confirm Tag Exists - runs-on: ubuntu-latest - needs: approval - steps: - - name: Generate GitHub App token - id: generate_token - uses: tibdex/github-app-token@v2 - with: - app_id: ${{ secrets.HAWKY_APP_ID }} - private_key: ${{ secrets.HAWKY_APP_PRIVATE_KEY }} - - name: Confirm release tag exists - run: | - echo "Release tag is ${{ github.ref }}" - publish-pypi: name: Publish to PyPI runs-on: ubuntu-latest environment: pypi - needs: tag + needs: approval steps: - uses: actions/checkout@v4 with: @@ -76,6 +61,10 @@ jobs: run: | git config user.name "HawkyMcBuilderFace[bot]" git config user.email "222944+HawkyMcBuilderFace[bot]@users.noreply.github.com" + - name: Set version from tag + run: | + TAG_NAME=${GITHUB_REF#refs/tags/v} + bumpver update --set-version $TAG_NAME --commit - name: Build package run: | python -m build @@ -86,7 +75,7 @@ jobs: publish-docker: name: Publish Docker image runs-on: ubuntu-latest - needs: tag + needs: approval steps: - uses: actions/checkout@v4 with: From 7e839d47b1367e1066ba81e1d09eff442c88d838 Mon Sep 17 00:00:00 2001 From: KC Berg Date: Tue, 8 Jul 2025 17:19:13 -0600 Subject: [PATCH 3/4] refactor: decouple tagging and publishing in release workflow, ensure approval and parallel publish from tag --- .github/workflows/release.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bdf2c94..b507773 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,11 +30,26 @@ jobs: mode: issue fail-on-denial: true + tag: + name: Confirm Tag Exists + runs-on: ubuntu-latest + needs: approval + steps: + - name: Generate GitHub App token + id: generate_token + uses: tibdex/github-app-token@v2 + with: + app_id: ${{ secrets.HAWKY_APP_ID }} + private_key: ${{ secrets.HAWKY_APP_PRIVATE_KEY }} + - name: Confirm release tag exists + run: | + echo "Release tag is ${{ github.ref }}" + publish-pypi: name: Publish to PyPI runs-on: ubuntu-latest environment: pypi - needs: approval + needs: tag steps: - uses: actions/checkout@v4 with: @@ -75,7 +90,7 @@ jobs: publish-docker: name: Publish Docker image runs-on: ubuntu-latest - needs: approval + needs: tag steps: - uses: actions/checkout@v4 with: From 6af26a5c0bf18030464ab89ed1a3f06f4c87db13 Mon Sep 17 00:00:00 2001 From: KC Berg Date: Tue, 8 Jul 2025 18:00:51 -0600 Subject: [PATCH 4/4] chore: commit and push any remaining changes --- .github/workflows/release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b507773..b01f902 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,10 +76,6 @@ jobs: run: | git config user.name "HawkyMcBuilderFace[bot]" git config user.email "222944+HawkyMcBuilderFace[bot]@users.noreply.github.com" - - name: Set version from tag - run: | - TAG_NAME=${GITHUB_REF#refs/tags/v} - bumpver update --set-version $TAG_NAME --commit - name: Build package run: | python -m build