From bc905d60e9bf173707b688b2a8d87b018c681a0e Mon Sep 17 00:00:00 2001 From: jakobmoellerdev Date: Fri, 15 Nov 2024 15:44:41 +0100 Subject: [PATCH] chore: completely kill auto bump because bump-release-branch-pr takes care of patch and release branches get bumped too via minor --- .github/workflows/release-branch.yaml | 2 +- ...ranch-bump.yaml => release-bump-version.yaml} | 0 .github/workflows/release.yaml | 16 +--------------- 3 files changed, 2 insertions(+), 16 deletions(-) rename .github/workflows/{release-branch-bump.yaml => release-bump-version.yaml} (100%) diff --git a/.github/workflows/release-branch.yaml b/.github/workflows/release-branch.yaml index 48c4f63b3b..f63d279c5f 100644 --- a/.github/workflows/release-branch.yaml +++ b/.github/workflows/release-branch.yaml @@ -90,7 +90,7 @@ jobs: # Make sure main contains the next minor after cutoff bump-main-pr: - uses: ./.github/workflows/release-branch-bump.yaml + uses: ./.github/workflows/release-bump-version.yaml needs: create-branch permissions: contents: write diff --git a/.github/workflows/release-branch-bump.yaml b/.github/workflows/release-bump-version.yaml similarity index 100% rename from .github/workflows/release-branch-bump.yaml rename to .github/workflows/release-bump-version.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fe3bf29f16..5abef69138 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -189,20 +189,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: make plain-push - - name: Bump Version File - if: inputs.release_candidate == false - run: | - set -e - git checkout ${GITHUB_REF#refs/heads/} - v="$(go run ./api/version/generate bump-minor)" - echo "$v" > VERSION - # Trigger a bump of any potential files that depend on a new version - make -f hack/Makefile mdref && make -f hack/Makefile go-bindata && make generate - git add --all - git commit -m "Update version to $v" - git push origin ${GITHUB_REF#refs/heads/} - echo "Next branch version is $v" - - name: Publish Release Event if: inputs.release_candidate == false uses: peter-evans/repository-dispatch@v3 @@ -226,7 +212,7 @@ jobs: # make sure that the branch contains the next valid patch bump-release-branch-pr: if: inputs.release_candidate == false - uses: ./.github/workflows/release-branch-bump.yaml + uses: ./.github/workflows/release-bump-version.yaml needs: release permissions: contents: write