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

Replace elimtype False by exfalso #995

Merged
merged 4 commits into from
Oct 17, 2023
Merged

Replace elimtype False by exfalso #995

merged 4 commits into from
Oct 17, 2023

Conversation

yforster
Copy link
Member

@SkySkimmer this should fix Coq master again

@yforster
Copy link
Member Author

I accidentally changed the CI to use coq-8.18 in this merge, that's why we didn't catch the incompatibility with Coq master -- now that's fixed as well

@JasonGross
Copy link
Contributor

The opam files also need to be updated, eg,

"coq" { >= "8.18" & < "8.19~" }

needs to permit dev

@yforster
Copy link
Member Author

Thanks @JasonGross!

@yforster
Copy link
Member Author

Still erroring in CI, but I think this error we've had before my merge as well? Good to merge into main @SkySkimmer?

@SkySkimmer
Copy link
Contributor

I don't know why you're asking me tbh

@JasonGross
Copy link
Contributor

I think this should be merged. I expect MetaCoq to still fail on Coq master with this universe error on vos mode, which I think is possibly a regression Coq-side. MetaCoq
CI side this can be fixed by disabling vos for whichever component is failing, which I seem to recall having to do for some part of quotation already.

@JasonGross
Copy link
Contributor

Ah, the change I had already made was

$(MAKE) -C quotation vos # quick # we cannot unset universe checking in 8.16 due to COQBUG(https://github.com/coq/coq/issues/17361), and quick does not buy much in quotation anyway, where almost everything is transparent

in

metacoq/Makefile

Lines 84 to 106 in adc980c

vos:
$(MAKE) -C utils
$(MAKE) -C common
$(MAKE) -C template-coq
$(MAKE) -C pcuic vos
$(MAKE) -C safechecker vos
$(MAKE) -C template-pcuic vos
$(MAKE) -C quotation vos
$(MAKE) -C erasure vos
$(MAKE) -C erasure-plugin vos
$(MAKE) -C translations vos
quick:
$(MAKE) -C utils
$(MAKE) -C common
$(MAKE) -C template-coq
$(MAKE) -C pcuic quick
$(MAKE) -C safechecker quick
$(MAKE) -C template-pcuic quick
$(MAKE) -C quotation vos # quick # we cannot unset universe checking in 8.16 due to COQBUG(https://github.com/coq/coq/issues/17361), and quick does not buy much in quotation anyway, where almost everything is transparent
$(MAKE) -C erasure quick
$(MAKE) -C erasure-plugin quick
$(MAKE) -C translations quick

@yforster yforster merged commit 64ce785 into main Oct 17, 2023
2 of 8 checks passed
@yforster yforster deleted the main-elimtype branch October 17, 2023 15:49
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.

3 participants