Allow ocaml/opam-repository to be added to a opam-repositories without hash errors#647
Merged
smorimoto merged 1 commit intoocaml:masterfrom Mar 4, 2023
Merged
Conversation
Member
|
@dra27 I think it would be much better for us in the future if you could leave an explicit comment about removing shim once opam 2.2 is available. (You and I both input so many things into our brains every day that we could easily pass this up...) |
This in opam 2.1 already, but shim the opam 2.0 calls on Windows to inherit it from a global setting.
Member
Author
|
I added a comment in the code, and I've put a post-release step on opam 2.2's release checklist |
Member
|
Thank you so much 🙂 |
smorimoto
approved these changes
Mar 4, 2023
This was referenced Mar 6, 2023
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.
Currently if you add ocaml/opam-repository to the opam-repositories field, e.g.
The installation of the compiler will fail with:
This is something which is already fixed in opam 2.1 (see ocaml/opam#3882). The proposed fix here works around the problem with the opam 2.0.10 binary from OCaml for Windows.
The problem is that the initial clone of the repository is checked out using Windows line-endings, which causes the hashing problem. The mechanism opam uses to update repositories means this would not happen on subsequent
opam updateinstructions. The workaround here is that setup-ocaml ensures thatcore.autocrlfis temporarily set toinputwhile adding the repositories (it then restores whatever setting either the runner or workflow had specified afterwards).This shim can be removed once setup-ocaml adopts opam 2.2 for the Windows runners.