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

Bump Dune lang version to 3.18 #11175

Merged
merged 5 commits into from
Dec 2, 2024
Merged

Bump Dune lang version to 3.18 #11175

merged 5 commits into from
Dec 2, 2024

Conversation

nojb
Copy link
Collaborator

@nojb nojb commented Dec 2, 2024

See #11166 (comment)

The second commit fixes the versioning guard of a change that was initially in 3.17 but was later reverted (see #11164).

nojb added 2 commits December 2, 2024 09:29
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb
Copy link
Collaborator Author

nojb commented Dec 2, 2024

CI failures look unrelated.

@Leonidas-from-XIV
Copy link
Collaborator

I've retriggered the failing tests manually and some failures are related (albeit easily fixed).

Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb
Copy link
Collaborator Author

nojb commented Dec 2, 2024

I've retriggered the failing tests manually and some failures are related (albeit easily fixed).

Thanks, fixed.

doc/test/run.t Outdated
../melange.rst: (lang dune 3.17)
../sites.rst: (lang dune 3.17)
../sites.rst: (lang dune 3.17)
../sites.rst: (lang dune 3.17)
Copy link
Collaborator

Choose a reason for hiding this comment

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

These probably need to be updated, as written in the description above.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

OK, done.

Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb nojb requested a review from christinerose as a code owner December 2, 2024 17:28
This reverts commit ed9c163.

Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb nojb force-pushed the bump_version_3_18 branch from e6abd81 to 1f63f3a Compare December 2, 2024 17:29
Copy link
Collaborator

@Leonidas-from-XIV Leonidas-from-XIV 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, thanks! The remaining failures are unrelated.

@nojb nojb merged commit 290a519 into ocaml:main Dec 2, 2024
26 of 28 checks passed
@nojb nojb deleted the bump_version_3_18 branch December 2, 2024 19:45
@ElectreAAS ElectreAAS mentioned this pull request Dec 11, 2024
12 tasks
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