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

Add a pick for 8.19.2 with the Ltac2 debugger (preview) #429

Merged
merged 1 commit into from
Nov 19, 2024

Conversation

jfehrle
Copy link
Member

@jfehrle jfehrle commented Sep 11, 2024

This works now.

I didn't include the patch file PR19247-ported-Fix-coqide-compilation-with-lablgtk-3.1.5-on-windows.patch because I previously included that commit in my branch.

@MSoegtropIMC
Copy link
Collaborator

The opam file for coqide misses the dependency. The original one has it here:

/~https://github.com/ocaml/opam-repository/blob/abac1deff0ec6249cf93f6b25ffdc49ae1caf04c/packages/coqide/coqide.8.19.2/opam#L24

You should copy the original one and deviate from it only as much as required.

@jfehrle
Copy link
Member Author

jfehrle commented Sep 11, 2024

OK, this works for me, I think it's good. If you merge soon, will this pick be included when you release CP 8.19?
If so, perhaps the announcement of CP 8.19 could briefly mention the Ltac2 debugger and say that more information on it will be sent out shortly (by me)?

Thanks.

@MSoegtropIMC
Copy link
Collaborator

@jfehrle : can you please rebase to latest main?

@jfehrle jfehrle force-pushed the ltac2_debugger branch 4 times, most recently from 798395e to cf00cd4 Compare October 31, 2024 19:15
@jfehrle
Copy link
Member Author

jfehrle commented Oct 31, 2024

I think I got it. I had some misconfiguration for this git project :-(

@jfehrle
Copy link
Member Author

jfehrle commented Nov 6, 2024

If you have no further comments, perhaps you could merge this soon? Thanks.

@jfehrle jfehrle force-pushed the ltac2_debugger branch 2 times, most recently from 28716f4 to d37981a Compare November 16, 2024 05:52
@jfehrle
Copy link
Member Author

jfehrle commented Nov 16, 2024

I took out the doc commit and updated a few files to match 8.19.2. So I think ready now.

@MSoegtropIMC
Copy link
Collaborator

@jfehrle : thanks!

Sorry, there is one more thing I missed (I got interrupted during my last review): your pick file became outdated vs. main. When you rebase you need to manually merge over changes to variants of pick files.

Please update your pick file to the changes in package-pick-8.19~2024.10.sh.

@jfehrle
Copy link
Member Author

jfehrle commented Nov 18, 2024

I think I got it, thanks. I can squash before the merge.

@MSoegtropIMC
Copy link
Collaborator

@jfehrle : thanks - yes looks good.

And yes, please squash.

@MSoegtropIMC
Copy link
Collaborator

I cancel the CI run, so that the squashed CI run gets through faster (otherwise it would have to wait).

@jfehrle
Copy link
Member Author

jfehrle commented Nov 18, 2024

Squashed

@MSoegtropIMC MSoegtropIMC merged commit 1a7db05 into coq:main Nov 19, 2024
16 checks passed
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