Skip to content
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

chore: Avoid result < 1.5 when installing, as this breaks on 4.08+ #10336

Merged
merged 1 commit into from
Mar 29, 2024

Conversation

Leonidas-from-XIV
Copy link
Collaborator

@Leonidas-from-XIV Leonidas-from-XIV commented Mar 29, 2024

Detected as part of #10300, the alternate solution in ocaml/opam-repository#25603 is unlikely to go forward at this point so this implements the policy of opam-repository and adds the conflict on our side.

Signed-off-by: Marek Kubica <marek@tarides.com>
@Leonidas-from-XIV Leonidas-from-XIV merged commit f3e1b3a into ocaml:main Mar 29, 2024
25 of 26 checks passed
@Leonidas-from-XIV Leonidas-from-XIV deleted the result-conflict branch March 29, 2024 15:33
Leonidas-from-XIV added a commit to Leonidas-from-XIV/dune that referenced this pull request Mar 29, 2024
)

Signed-off-by: Marek Kubica <marek@tarides.com>
@emillon emillon mentioned this pull request Mar 29, 2024
22 tasks
Leonidas-from-XIV added a commit that referenced this pull request Mar 29, 2024
@anmonteiro
Copy link
Collaborator

Is this needed after #10261 ?

@Leonidas-from-XIV
Copy link
Collaborator Author

This is necessary because of #10261. Before we required result.1.5 and everything worked, but after removing it (which is a good thing!) package solutions could going forward pick result < 1.5 (in the case of the CI failure linked it was result.1.0) which defines a result type that is not compatible with that one in 4.08+, so when dune-rpc-lwt would use the 4.08-builtin result and another package would use result.1.0-provided result they wouldn't be compatible.

My first thought was to restrict result to only have result.1.5 on 4.08+ so I posted ocaml/opam-repository#25603 but as you can read in the issues linked it wasn't the first time that this has bit someone. For now packages are supposed to conflict with result until compatibility with versions older than 4.08 is dropped from opam-repository.

In practice this mostly affects the low-version check in opam-repository, because users would get result.1.5 as that is the newest version and a number of other packages already conflict on result < 1.5.

@anmonteiro
Copy link
Collaborator

understood, thanks for the details!

pmwhite pushed a commit to pmwhite/dune that referenced this pull request Apr 2, 2024
)

Signed-off-by: Marek Kubica <marek@tarides.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants