Skip to content

opam root version: fix upgrade from a non global config change#5305

Merged
dra27 merged 4 commits intoocaml:masterfrom
rjbou:root-fx
Feb 28, 2023
Merged

opam root version: fix upgrade from a non global config change#5305
dra27 merged 4 commits intoocaml:masterfrom
rjbou:root-fx

Conversation

@rjbou
Copy link
Copy Markdown
Collaborator

@rjbou rjbou commented Sep 30, 2022

No description provided.

@rjbou rjbou added PR: QUEUED Pending pull request, waiting for other work to be merged or closed PR: WIP Not for merge at this stage labels Sep 30, 2022
@rjbou rjbou added this to the 2.2.0~alpha milestone Sep 30, 2022
@rjbou rjbou added PR: WAITING FOR REVIEW and removed PR: WIP Not for merge at this stage labels Oct 13, 2022
@rjbou rjbou removed the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Oct 14, 2022
@rjbou rjbou force-pushed the root-fx branch 2 times, most recently from 0efc815 to afbcb56 Compare January 27, 2023 16:29
@rjbou rjbou mentioned this pull request Jan 27, 2023
1 task
@rjbou rjbou added PR: WIP Not for merge at this stage PR: NEEDS UPDATE and removed PR: WAITING FOR REVIEW PR: WIP Not for merge at this stage labels Feb 9, 2023
Copy link
Copy Markdown
Member

@dra27 dra27 left a comment

Choose a reason for hiding this comment

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

We're nearly there with this thorny thing! I have various notes to put back into the wiki on the root versions stuff.


let internal = "repos-config"
let format_version = OpamVersion.of_string "2.0"
let format_version = OpamVersion.of_string "2.1"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It would be better to bump it straight to 2.2, wouldn't it? (I think the "gap" is less confusing than having a 2.1 version of the format which technically can't be read by opam 2.1's libraries!)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I don't remember what we say about those versions : should they follow opam versions ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think the intention was that we'd use opam versions when it was bumped, yes - so it just so happened that opam 2.1 uses opam 2.0's repo config format

@rjbou
Copy link
Copy Markdown
Collaborator Author

rjbou commented Feb 15, 2023

Updated

Used to retrieve information about remaining upgrades to do (repo or
switch)
When root is bumped but only repo or switch is modified, upgraded files
can be written without writing the root bump (on-the-fly global state
upgrade).
Copy link
Copy Markdown
Member

@dra27 dra27 left a comment

Choose a reason for hiding this comment

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

LGTM! (sorry for the delay re-reviewing)

@dra27 dra27 merged commit 88002fb into ocaml:master Feb 28, 2023
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.

2 participants