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

Coq 8.19 #702

Merged
merged 40 commits into from
Feb 8, 2024
Merged

Coq 8.19 #702

merged 40 commits into from
Feb 8, 2024

Conversation

gares
Copy link
Member

@gares gares commented Dec 24, 2023

Since 8.19+rc1 is tagged, I tried to merge coq-master into main, and have a single branch as we discussed.
The only file I ported is language/hover.ml where you can see ppx_optcomp in action.

I have a weird problem with dune 3.5, not the version of the software, which seems required in order to have the coq:version variables, but with (lang dune 3.5) in dune-project. Mysterious sanboxing error.

Also nix/flake is broken, I did commit the merge error, since I have no clue.

TODO for CI:

maximedenes and others added 22 commits August 21, 2023 16:34
Adapt to coq/coq#17928 (Search uses search_restriction instead of bool)
…arch-pass-sigma

Adapt to Coq PR #17987 which adds sigma to the API of search functions
.github/workflows/ci.yml Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
@gares
Copy link
Member Author

gares commented Dec 25, 2023

The source code is ported, the same code (modulo a few ifdefs) works on 8.18 and 8.19.
It is a bit unclear to me how to adapt the release process / versioning schema, but that is for @rtetley I guess.

@gares
Copy link
Member Author

gares commented Dec 25, 2023

See also coq/coq#18440

@gares
Copy link
Member Author

gares commented Jan 31, 2024

I think the nix problem is related to dune. I did have a weird problem using the coq:version variable, see my initial message.

@rtetley rtetley marked this pull request as ready for review February 2, 2024 08:48
@rtetley
Copy link
Collaborator

rtetley commented Feb 2, 2024

@gares I think we're good ! Would you care to check and merge ?

@rtetley
Copy link
Collaborator

rtetley commented Feb 2, 2024

Although it just dawned on me, why do we need coqc to build @gares ?

@gares
Copy link
Member Author

gares commented Feb 2, 2024

I've updated the TODO list up there.

Make devShells for coq 8.18, coq 8.19 and coq master.
Run them all in the CI.
Fixing Coq pin in flake and adding correction to make coq master
branch compile.
.github/workflows/ci.yml Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
@rtetley
Copy link
Collaborator

rtetley commented Feb 7, 2024

Seems we're good on this side ! What's the next step to make coq/coq#18440 happen @gares ?

@rtetley
Copy link
Collaborator

rtetley commented Feb 8, 2024

@gares should I just merge ? I really want to get that next release going to support Coq 8.19 !

@rtetley rtetley merged commit 4eefe13 into main Feb 8, 2024
15 checks passed
@gares gares deleted the coq-8.19 branch February 8, 2024 19:52
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.

7 participants