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

Fix macOS Runner when Meson is Already Installed, and Add macOS 15 #1253

Merged
merged 6 commits into from
Oct 14, 2024

Conversation

dgreatwood
Copy link
Contributor

It appears that the github macOS runners now have meson preinstalled.

This was causing an issue when our macos.yaml did:
brew install meson
We now have macos.yaml check for meson, and install it only if meson is not already present.

Also, added the newly released macOS-15 as one of the OS to test in macos.yaml.

Otherwise, we get:
    Error: The `brew link` step did not complete successfully
when brew is trying to upgrade Python3 for meson's use upon the
command "brew install meson" in the github runner.
Otherwise github runner for macOS can generate an error attempting to
upgrade Python.
@kiplingw
Copy link
Member

Looks fine to me @dgreatwood. Good work. If nothing (new) breaks in CI, I'll merge after its done.

Copy link

codecov bot commented Oct 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.18%. Comparing base (e07dc0b) to head (ffb4e48).
Report is 12 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1253      +/-   ##
==========================================
- Coverage   76.29%   76.18%   -0.12%     
==========================================
  Files          58       57       -1     
  Lines       10027     9821     -206     
==========================================
- Hits         7650     7482     -168     
+ Misses       2377     2339      -38     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dgreatwood
Copy link
Contributor Author

dgreatwood commented Oct 13, 2024 via email

In macOS runner for macOS-13, brew update may be causing it to attempt
to install newer version of Python with meson (newer than the one
installed in the github macOS image), but the new Python install
fails, blocked by the version of Python3 that's already installed.
We avoid doing "brew update" - the brew formulas that are preinstalled
on the github runner image are likely consistent with the
pre-installed software on the image. If we do "brew upate", and then
install something new with brew (specifically meson), and the
"something new" depends on pre-installed software on the image, and
there are new versions of the pre-installed software revealed by doing
"brew update", then when we install the "something new" brew may try
and also install a new version of the pre-installed software on which
the "something new" depends, but that attempt to install a new version
of the pre-installed software can fail as a result of being blocked by
the software that is already installed.

Also, removed this branch from list of branches to run macos.yaml.
@dgreatwood
Copy link
Contributor Author

dgreatwood commented Oct 14, 2024 via email

@kiplingw kiplingw merged commit fdb7d08 into pistacheio:master Oct 14, 2024
150 of 158 checks passed
@Tachi107
Copy link
Member

Late review, but looks good to me!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants