Skip to content

Commit

Permalink
chore: completely kill auto bump because bump-release-branch-pr takes…
Browse files Browse the repository at this point in the history
… care of patch and release branches get bumped too via minor
  • Loading branch information
jakobmoellerdev committed Nov 15, 2024
1 parent f49b7ce commit bc905d6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
16 changes: 1 addition & 15 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit bc905d6

Please sign in to comment.