audit: compare current version to last committed version when seeing if revision should be reset #8576
+8
−1
Conversation
This file contains 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
|
This isn't quite right either -- if you're already up to date with origin/master, then current_version and newest_committed_version will point to the same commit. |
dtrodrigues
force-pushed
the
revision-audit
branch
2 times, most recently
from
5a85a13 to
f01d2b1
Compare
|
Looks like we did need to check for both the case that was already tested for as well as this new case. |
MikeMcQuaid
approved these changes
Sep 3, 2020
Library/Homebrew/dev-cmd/audit.rb
Outdated
| @@ -896,6 +896,11 @@ def audit_revision_and_version_scheme | |||
| current_revision == newest_committed_revision && | |||
| current_revision == previous_revision | |||
| problem "'revision #{current_revision}' should be removed" | |||
| elsif current_version != newest_committed_version && | |||
There was a problem hiding this comment.
(current_version != newest_committed_version || previous_version != newest_committed_version) would allow this to be combined with the section above.
…if revision should be removed
dtrodrigues
force-pushed
the
revision-audit
branch
from
f01d2b1 to
76ec69e
Compare
5 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
brew stylewith your changes locally?brew testswith your changes locally?#7684 refactored the logic to audit if formula version/revision numbers made sense. It compared the previous version with the newest committed version to see if the revision should have been reset. However, in the case where the last commit is a was a different version than the current formula,
previous_versionandnewest_committed_versionwill be equal, even though they both differ from the current version.This change now compares the current formula version with the previous committed version to see if the revision should have be reset.
See Homebrew/homebrew-core#60536 (comment)
cc @MikeMcQuaid @SMillerDev