Skip to content

Conversation

@proux01
Copy link
Contributor

@proux01 proux01 commented Sep 17, 2024

Adapt to rocq-prover/rocq#19530
To be merged in sync with the upstream PR.

@proux01 proux01 changed the title Stdlib repo Adapt to https://github.com/coq/coq/pull/19530 Sep 17, 2024
@proux01 proux01 changed the base branch from coq-8.19 to main September 23, 2024 12:30
@proux01
Copy link
Contributor Author

proux01 commented Sep 23, 2024

As noted by @andres-erbsen in rocq-prover/rocq#19530 (comment) this was accidentaly targetting the wrong branch, fixed.

@proux01 proux01 force-pushed the stdlib_repo branch 6 times, most recently from fa5d4e6 to 96bb751 Compare December 3, 2024 09:59
@proux01 proux01 marked this pull request as ready for review December 6, 2024 09:26
@proux01
Copy link
Contributor Author

proux01 commented Dec 6, 2024

Upstream PR merged, please merge

@ppedrot
Copy link
Collaborator

ppedrot commented Dec 7, 2024

I'm taking the liberty to merge this so as to fix the Coq CI quickly.

@ppedrot ppedrot merged commit a1b0749 into MetaRocq:main Dec 7, 2024
2 of 10 checks passed
@proux01 proux01 deleted the stdlib_repo branch January 3, 2025 10:17
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