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

MacOS CI: install pkgconf instead of pkg-config #19836

Merged
merged 1 commit into from
Nov 15, 2024

Conversation

SkySkimmer
Copy link
Contributor

@SkySkimmer SkySkimmer commented Nov 15, 2024

Hopefully fix CI

(pkgconf is a replacement of pkg-config)

cf ocaml/opam-repository#26891

@SkySkimmer SkySkimmer added the kind: infrastructure CI, build tools, development tools. label Nov 15, 2024
@SkySkimmer SkySkimmer requested a review from a team as a code owner November 15, 2024 13:15
@coqbot-app coqbot-app bot added the needs: full CI The latest GitLab pipeline that ran was a light CI. Say "@coqbot run full ci" to get a full CI. label Nov 15, 2024
@SkySkimmer SkySkimmer removed the needs: full CI The latest GitLab pipeline that ran was a light CI. Say "@coqbot run full ci" to get a full CI. label Nov 15, 2024
@coqbot-app coqbot-app bot added the needs: full CI The latest GitLab pipeline that ran was a light CI. Say "@coqbot run full ci" to get a full CI. label Nov 15, 2024
Hopefully fix CI

(pkgconf is a replacement of pkg-config)

- name: Install OCaml dependencies
run: |
export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this was doing anything

Comment on lines +17 to +20
brew unlink pkg-config
brew install gnu-time opam gtksourceview3 adwaita-icon-theme expat libxml2 pkgconf
brew unlink pkgconf
brew link pkg-config
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems to be working even though it's a strange back-and-forth

note that the image comes with pkg-config preinstalled AFAICT

History:
With the previous install pkg-config we get error https://github.com/coq/coq/actions/runs/11856721924/job/33043567199?pr=19835

The following system packages will first need to be installed:
    pkgconf

if we want to install pkgconf we must unlink pkg-config
then with unlink pkg-config; install pkgconf we get https://github.com/coq/coq/actions/runs/11857007213/job/33044451483

ERROR while compiling conf-pkg-config.3
# [ERROR] Command not found: pkg-config

If we install pkgconf but unlink it in favor of pkg-config as in the current code it seems to work

Copy link
Contributor

@mseri mseri Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One solution would be to opam pin conf-pkg-config.2 when on a macos runner, then you don’t need any other change.

At some point the image will be updated with an updated homebrew cache I guess, then the pin will fail and you can remove it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the breakage, by the way. Even if it would have happened also by releasing a version 4 of the conf package, it may have been clearer that way

@SkySkimmer SkySkimmer removed the needs: full CI The latest GitLab pipeline that ran was a light CI. Say "@coqbot run full ci" to get a full CI. label Nov 15, 2024
@SkySkimmer SkySkimmer modified the milestones: 8.20.1, 9.0+rc1 Nov 15, 2024
@SkySkimmer SkySkimmer mentioned this pull request Nov 15, 2024
5 tasks
Copy link
Contributor

@proux01 proux01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge as it seems to work, this can be potentially refine dlater if needed.

@proux01 proux01 self-assigned this Nov 15, 2024
@proux01
Copy link
Contributor

proux01 commented Nov 15, 2024

@coqbot merge now

@coqbot-app coqbot-app bot merged commit 671f84d into coq:master Nov 15, 2024
6 checks passed
@SkySkimmer SkySkimmer deleted the brew-pkgconf branch November 15, 2024 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind: infrastructure CI, build tools, development tools.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants