fix: use PR + auto-merge for chart bump (branch protection)#68
Merged
fix: use PR + auto-merge for chart bump (branch protection)#68
Conversation
Direct push to main is blocked by branch protection rules. Revert to PR approach but with auto-merge enabled, so the appVersion still matches the correct image SHA. Follows up on #66
pahud
approved these changes
Apr 6, 2026
Reese-max
pushed a commit
to Reese-max/openab
that referenced
this pull request
Apr 12, 2026
…v#68) Direct push to main is blocked by branch protection rules. Revert to PR approach but with auto-merge enabled, so the appVersion still matches the correct image SHA. Follows up on openabdev#66 Co-authored-by: thepagent <thepagent@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #67 — direct push to main is blocked by branch protection rules (
GH013: Changes must be made through a pull request).Change
Replace
git push origin mainwith PR creation +gh pr merge --squash --auto --delete-branch. This:image-shastep from fix: CI appVersion mismatch + Helm OCI namespace collision #67)Note on appVersion after merge
The auto-merged PR will create a new merge commit, but the Chart.yaml inside it will contain the correct image SHA (captured during the build). The merge commit SHA itself is irrelevant — what matters is the
appVersionfield value, which points to the actual Docker image tag.Follows up on #66