-
Notifications
You must be signed in to change notification settings - Fork 160
fix: make checkout expected-commit bump less greedy #2008
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
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
Signed-off-by: Ben Tasker <[email protected]>
Signed-off-by: Ben Tasker <[email protected]>
Signed-off-by: Ben Tasker <[email protected]>
imjasonh
reviewed
Jun 16, 2025
…ckout` blocks being bumped by `melange bump` calls Signed-off-by: Ben Tasker <[email protected]>
imjasonh
approved these changes
Jun 16, 2025
4 tasks
debasishbsws
added a commit
to wolfi-dev/os
that referenced
this pull request
Jul 28, 2025
…version` for proper commit bumping
* Melange now only updates `expected-commit` in `git-checkout` when tags match either `${{package.version}}` or `${{vars.mangled-package-version}}` ([melange#2008](chainguard-dev/melange#2008))
Signed-off-by: Debasish Biswas <[email protected]>
debasishbsws
added a commit
to wolfi-dev/os
that referenced
this pull request
Jul 28, 2025
…version` for proper commit bumpin
* Melange now only updates `expected-commit` in `git-checkout` when tags match either `${{package.version}}` or `${{vars.mangled-package-version}}` ([melange#2008](chainguard-dev/melange#2008))
* Previously we used a custom var `underscore-package-version`, which is no longer recognized by the updater logic
* This change renames `underscore-package-version` to `mangled-package-version` so it integrates correctly with Melange's update mechanism and enables automatic commit updates
* fix the commit SHA
Signed-off-by: Debasish Biswas <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Melange Pull Request Template
Prior to this commit, bumps updated
expected-commitfor any git checkout node who'stagattribute matched the regular expression\${{vars\..+}}(i.e. anything which used a variable).This made the logic very greedy, clobbering values for unrelated checkouts (for example here)
We only want bumps to update those where
tagmatches eitherpackage.versionorvars.mangled-package-version.Currently we use the following vars in
tagattributes:It also adds a check to ensure that
expected-commitdoes not contain a variable (i.e.${{) before overwriting it's value