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

Adapt to https://github.com/coq/coq/pull/20036 #456

Merged
merged 2 commits into from
Jan 15, 2025

Conversation

proux01
Copy link

@proux01 proux01 commented Jan 14, 2025

Adapt to coq/coq#20036

@MSoegtropIMC the coqide package has been renamed rocqide by above mentionned PR, I hope this can fix Windows CI on Coq master.

@MSoegtropIMC
Copy link
Collaborator

I think the picks tested in CI in the coq-ci branch should be adjusted. The only relevant pick in this branch is this:

https://github.com/coq/platform/blob/coq-ci/package_picks/package-pick-ci.sh

Can you please add this and remove all other picks in the CI YAML files for the coq-ci branch? Feel free to remove all other picks from the coq-ci branch.

This is also the pick in which coqide needs to be adjusted - it isn't.

Sorry for the mess - I hacked this branch together in a bit of a hurry.

If you prefer, I can also do the changes on your PR.

@proux01
Copy link
Author

proux01 commented Jan 15, 2025

I think the picks tested in CI in the coq-ci branch should be adjusted. The only relevant pick in this branch is this:

https://github.com/coq/platform/blob/coq-ci/package_picks/package-pick-ci.sh

Can you please add this and remove all other picks in the CI YAML files for the coq-ci branch? Feel free to remove all other picks from the coq-ci branch.

Done

This is also the pick in which coqide needs to be adjusted - it isn't.

Not sure what you're expecting here. In Coq CI, things are configured to use the rocqide.opam file in Coq's repo.

Sorry for the mess - I hacked this branch together in a bit of a hurry.

If you prefer, I can also do the changes on your PR.

No worries. Just to be clear, my most pressing need is to fix Coq CI for windows that is currently broken (pretty bad with 9.0 release candidate expected next week). If CI remains broken here on this coq-ci branch, it's probably no big deal for now.

@proux01
Copy link
Author

proux01 commented Jan 15, 2025

Since we need this to fix Coq CI, let's merge. We can still refine it later.

@proux01 proux01 merged commit e99ad1c into coq:coq-ci Jan 15, 2025
2 of 5 checks passed
@proux01 proux01 deleted the coq_20036 branch January 15, 2025 12:16
@ppedrot
Copy link
Member

ppedrot commented Jan 15, 2025

Doesn't seem to have been enough:

cp: cannot stat 'source/coqide/ide/coqide/coq.ico': No such file or directory

@Zimmi48
Copy link
Member

Zimmi48 commented Jan 15, 2025

The icon files still exist under ide/rocqide, but this should be a reminder to us to update the icon files to actually be the one of Rocq.

EDIT: I opened coq/coq#20059.

@proux01
Copy link
Author

proux01 commented Jan 15, 2025

Let's see what happens following: #457

@MSoegtropIMC
Copy link
Collaborator

MSoegtropIMC commented Jan 15, 2025

This is also the pick in which coqide needs to be adjusted - it isn't.

Not sure what you're expecting here. In Coq CI, things are configured to use the rocqide.opam file in Coq's repo.

I meant that you need to rename the opam package name in the coq-ci.sh file - it is meanwhile, but it wasn't the case when I wrote my comment.

Please feel free to merge to the coq-ci branch as needed - this is the reason why it exists.

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.

4 participants