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

Add ocaml-src.4.13.0 #18229

Merged
merged 2 commits into from
Sep 8, 2021
Merged

Add ocaml-src.4.13.0 #18229

merged 2 commits into from
Sep 8, 2021

Conversation

kit-ty-kate
Copy link
Member

Mirage packages always get left behind because of the lack of ocaml-src package in opam-repository.
This proposal creates a placeholder package to update at each alpha/beta/rc (with their respective checksums) and one last time for the final release.

@Octachron @hannesm @mato what do you think?

@camelus
Copy link
Contributor

camelus commented Feb 25, 2021

Commit: 7919c82

Good to see you Madam.

🌤️ opam-lint warnings 7919c82
  • ocaml-src.4.13+trunk has some warnings:

    • warning 36: Missing field 'bug-reports'
    • warning 37: Missing field 'dev-repo'

☀️ Installability check (+1)
  • new installable packages (1): ocaml-src.4.13+trunk

🌤️ 1 ignored non-opam files:
  • packages/ocaml-src/ocaml-src.4.13+trunk/files/META

@hannesm
Copy link
Member

hannesm commented Mar 2, 2021

I am in favor of this PR.

Copy link
Member

@avsm avsm left a comment

Choose a reason for hiding this comment

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

I'm generally fine with opam-repository tracking ocaml trunk with git urls, so that our metadata is consistent.

extra-files: ["META" "md5=a86cbc1fb202e11ff24cde77754c9d93"]
url {
# TODO: Update on each alpha/beta/rc releases and one last time for the final release
src: "https://github.com/ocaml/ocaml/archive/trunk.tar.gz"
Copy link
Member

Choose a reason for hiding this comment

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

This should be a git src so that opam update will pick up on upstream commits and track them correctly.

Copy link
Member Author

Choose a reason for hiding this comment

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

if we do that, we need to do the same thing in ocaml-variants.4.13.0+trunk as it is not currently the case

Copy link
Member

Choose a reason for hiding this comment

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

Those are compiler packages, whereas this is a library package (that is, used as a dependency in various Mirage builds).

Copy link
Member

Choose a reason for hiding this comment

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

(note that it's fine to change the compiler packages too, but that's a separate change unrelated to this one)

@dra27
Copy link
Member

dra27 commented Mar 4, 2021

I don't know what @Octachron's opinion is, but I'm slightly uncomfortable with version 4.13.0 of the OCaml sources appearing to be published! Can it be a simple matter of it being 4.13+trunk (no need for the .0)?

@avsm
Copy link
Member

avsm commented Mar 4, 2021

Yes good idea, adding +trunk to the version would reflect the development status nicely.

@mato
Copy link
Contributor

mato commented Mar 10, 2021

Looks reasonable to me. As others have said, having the version be 4.13+trunk is a good idea. It does mean that there will need to be a manual update to ocaml-src and Mirage ocaml-freestanding once a 4.13.0 is released, but that won't hold back Mirage packages in the mean time.

What is the purpose of the META file?

@hannesm
Copy link
Member

hannesm commented Mar 10, 2021

What is the purpose of the META file?

IIRC it is needed for ocamlfind to consider the package being installed, from ocaml-freestanding Makefile: cp -r `ocamlfind query ocaml-src` ./ocaml.

@kit-ty-kate
Copy link
Member Author

kit-ty-kate commented Mar 11, 2021

I don't know what @Octachron's opinion is, but I'm slightly uncomfortable with version 4.13.0 of the OCaml sources appearing to be published! Can it be a simple matter of it being 4.13+trunk (no need for the .0)?

I agree with 4.13+trunk, however one annoying thing with naming it like this is that 4.13+trunk < 4.13.0 according to opam/debian version ordering. The version ordering is sort of true now but it won't be true anymore after the release. 4.13.trunk would do the job in that regard. What do you think? If this scheme is fine, we might want to switch ocaml-variants.4.13.0+trunk to use the same version scheme (ocaml-variants.4.13.trunk) as it avoids the deletion/moving of for instance 4.12.0+trunk --> 4.12.1+trunk that was a bit annoying in CI after the last release.

@dra27
Copy link
Member

dra27 commented Mar 12, 2021

I don't know what @Octachron's opinion is, but I'm slightly uncomfortable with version 4.13.0 of the OCaml sources appearing to be published! Can it be a simple matter of it being 4.13+trunk (no need for the .0)?

I agree with 4.13+trunk, however one annoying thing with naming it like this is that 4.13+trunk < 4.13.0 according to opam/debian version ordering. The version ordering is sort of true now but it won't be true anymore after the release. 4.13.trunk would do the job in that regard. What do you think? If this scheme is fine, we might want to switch ocaml-variants.4.13.0+trunk to use the same version scheme (ocaml-variants.4.13.trunk) as it avoids the deletion/moving of for instance 4.12.0+trunk --> 4.12.1+trunk that was a bit annoying in CI after the last release.

Ah, thanks for looking at this properly - I had a memory there was a reason we didn't always drop the ".0", and this is it! Two thoughts:

  • Once OCaml 4.13 is released, we wouldn't want the temporary package to be used, so in many respects ocaml-src.4.13+trunk < ocaml-src.4.13.0 is a feature. Perhaps we should there better choose a better moniker than +trunk - +pre or +prerelease?
  • For ocaml-variants, I had been thinking of another rename to avoid the version bumps too - given that trunk is the only the name of the main branch (and the OCaml dev team are considering a rename at some point), switching to the .trunk suggestion works, but again with a different moniker - perhaps ocaml-variants.4.13.next or .dev? (that can move to another issue, though).

@github-actions github-actions bot added the Stale label Jul 21, 2021
@github-actions github-actions bot closed this Aug 20, 2021
@kit-ty-kate kit-ty-kate reopened this Aug 20, 2021
@kit-ty-kate kit-ty-kate removed the Stale label Aug 20, 2021
@kit-ty-kate kit-ty-kate merged commit a482435 into ocaml:master Sep 8, 2021
@kit-ty-kate kit-ty-kate deleted the 413 branch September 8, 2021 11:56
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.

None yet

6 participants