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

Revert #112 #113

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Revert #112 #113

merged 2 commits into from
Jun 2, 2021

Conversation

kit-ty-kate
Copy link
Contributor

The fix for ocaml/opam#4682 is now merged and it is safe to resume with opam master

@kit-ty-kate kit-ty-kate force-pushed the opam-2.1-confirm-level branch from 5b08d8c to e9b8f4e Compare June 2, 2021 09:37
Copy link
Contributor

@talex5 talex5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. GitHub seems to be having some trouble at the moment, which might explain why CI didn't run.

@talex5
Copy link
Contributor

talex5 commented Jun 2, 2021

@avsm : I see a "do not build a 4.10 multicore anymore, just 4.12" commit on live, but I don't see a PR for it. Do you want to keep that?

@kit-ty-kate
Copy link
Contributor Author

I can't fully test this locally (I don't have the credentials for docker.io/ocurrent/opam-staging) but I tested the best I could using the first stage image and it works as expected.

@avsm
Copy link
Member

avsm commented Jun 2, 2021

I want to keep that; Ill reconcile the branches now @talex5. thanks for the tests to date kate!

@avsm avsm merged commit c02507b into ocurrent:master Jun 2, 2021
@kit-ty-kate kit-ty-kate deleted the opam-2.1-confirm-level branch June 2, 2021 13:43
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.

3 participants