Fix the install cache storing the wrong version of the opam file after a build failure #6213
+382
−9
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
kit-ty-kate
changed the title
rjbou
reviewed
Oct 10, 2024
src/client/opamSolution.ml
Outdated
Comment on lines
832
to
838
| List.exists (function | ||
| | `Fetch ps -> List.for_all (OpamPackage.equal nv) ps | ||
| | `Build p | ||
| | `Change (_, _, p) | ||
| | `Install p | ||
| | `Reinstall p | ||
| | `Remove p -> OpamPackage.equal nv p) |
There was a problem hiding this comment.
The failure is specific to build and fetch errors, maybe adding a comment have that information. It's permit to explain why we need to have that check on install cache update.
There was a problem hiding this comment.
I don't really think this part of the code needs a comment but i do agree that the section (filtering as a whole) needed one so i added one. What do you think?
rjbou
force-pushed
the
no-recompile-after-build-failure
branch
from
ffa19eb
to
9b891a7
Compare
kit-ty-kate
force-pushed
the
no-recompile-after-build-failure
branch
2 times, most recently
from
39e587f
to
28fe994
Compare
…on failure It highlights a package mistakenly marked as to be reinstalled Co-authored-by: Raja Boujbel <raja.boujbel@ocamlpro.com>
…r a build or fetch failure
kit-ty-kate
force-pushed
the
no-recompile-after-build-failure
branch
from
28fe994
to
232b15d
Compare
rjbou
approved these changes
Oct 10, 2024
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.
Upgrades from 2.2 to 2.3 can trigger issues where a repository forgot to add the missing extra-files field.
opam tells the user they should upgrade as the opam file changed (as extra-files was added automatically), then the build fails and upon fixing the error, opam still says the package is to be rebuilt because the previous version of the opam file was stored in the install cache.
This should be backported to the 2.3 branch as it can easily be triggered during the upgrade from 2.2 to 2.3.
Backported to 2.3 via #6214
Potentially related to #5922