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.

Sign up for GitHub

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

Jump to bottom

Reset the "jobs" config variable when upgrading to opam 2.2 #5904

Merged
merged 2 commits into from May 8, 2024
Merged

Reset the "jobs" config variable when upgrading to opam 2.2 #5904

merged 2 commits into from May 8, 2024

Conversation

kit-ty-kate
Copy link
Member

Fixes #5816

@kit-ty-kate kit-ty-kate force-pushed the reset-jobs-2.2 branch 2 times, most recently from 66b9fdf to 1549928 Compare April 2, 2024 16:38
@kit-ty-kate kit-ty-kate added this to For RC in Opam 2.2.0 Apr 2, 2024
@kit-ty-kate kit-ty-kate force-pushed the reset-jobs-2.2 branch 3 times, most recently from 3df870a to da65328 Compare April 3, 2024 11:58
@kit-ty-kate kit-ty-kate moved this from For RC to For beta3 in Opam 2.2.0 Apr 8, 2024
@kit-ty-kate kit-ty-kate added this to the 2.2.0~beta3 milestone Apr 10, 2024
@rjbou rjbou self-requested a review May 2, 2024 13:09
@kit-ty-kate
Copy link
Member Author

Note from the dev meeting: a better fix would be to upgrade the root-version to 2.2~beta and move the upgrade there instead to prevent issues for (rare) people who would have upgraded their opam all the way from 2.0 to 2.1 to 2.2.0~alpha (in which case this code would not have been run)

rjbou
rjbou reviewed May 3, 2024
View reviewed changes
Copy link
Collaborator

@rjbou rjbou left a comment

Choose a reason for hiding this comment

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

Thanks! Agree with your comment, we'll see when we upgrade the root number.

master_changes.md Outdated Show resolved Hide resolved
src/state/opamFormatUpgrade.ml Outdated Show resolved Hide resolved
@kit-ty-kate kit-ty-kate force-pushed the reset-jobs-2.2 branch 3 times, most recently from 1500377 to f4bd17d Compare May 3, 2024 12:39
@kit-ty-kate
Copy link
Member Author

Ready to be reviewed again

@kit-ty-kate kit-ty-kate requested a review from rjbou May 7, 2024 13:28
rjbou
rjbou reviewed May 7, 2024
View reviewed changes
Copy link
Collaborator

@rjbou rjbou left a comment

Choose a reason for hiding this comment

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

Once the reftest reviewed, good to go!
thanks!

tests/reftests/opamroot-versions.test Outdated Show resolved Hide resolved
@kit-ty-kate kit-ty-kate requested a review from rjbou May 7, 2024 17:05
rjbou
rjbou approved these changes May 7, 2024
View reviewed changes
Copy link
Collaborator

@rjbou rjbou left a comment

Choose a reason for hiding this comment

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

As the tests looks good, unblocking :)

@kit-ty-kate kit-ty-kate merged commit e11ebbf into ocaml:master May 8, 2024
29 checks passed
Opam 2.2.0 automation moved this from For beta3 to Done May 8, 2024
@kit-ty-kate kit-ty-kate deleted the reset-jobs-2.2 branch May 8, 2024 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rjbou rjbou rjbou approved these changes

Assignees
No one assigned
Labels
STATE: READY TO MERGE
Projects
Opam 2.2.0
  
Done
Milestone
2.2.0~beta3
Development

Successfully merging this pull request may close these issues.

jobs variable reset only works when upgrading format from 2.0 -> 2.2, not 2.0 -> 2.1 -> 2.2
2 participants
@kit-ty-kate @rjbou