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-latest was migrated from macOS 12 on amd64 to macOS 14 on arm64 #4449

Merged
merged 4 commits into from
May 6, 2024

Conversation

hummeltech
Copy link
Contributor

@hummeltech hummeltech commented Apr 26, 2024

The switchover appears to have been made on or around 2024.04.22:
https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image/

There seems to be an issue building the freexl dependency on arm64 using vcpkg, which was reported last September (microsoft/vcpkg#33548) but lacked sufficient information in order to be resolved. This issue seems to be caused by libtool not being present in the macos-14/macos-latest image.

This pull request adds building with both macos-13 and macos-14 (macos-latest) in order to test macOS on both architectures.

Also:

  • Removed the ASzc/change-string-case-action dependency in favor of using perl (which is installed on all runners.)
  • Addressed coverage capturing issues exhibited after recent upgrade to LCOV 2.1 on macOS runners

Here are some example CI job runs:

2024.04.22 (macos-latest -> macos-12)

2024.04.25 (macos-latest -> macos-14-arm64):

Copy link

codecov bot commented Apr 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 73.75%. Comparing base (7c45369) to head (09067f5).
Report is 11 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4449      +/-   ##
==========================================
+ Coverage   72.69%   73.75%   +1.06%     
==========================================
  Files         503      525      +22     
  Lines       30706    33532    +2826     
  Branches     3915     4139     +224     
==========================================
+ Hits        22321    24733    +2412     
- Misses       8383     8797     +414     
  Partials        2        2              

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

@hummeltech
Copy link
Contributor Author

Builds on macOS ARM64 are now passing, however the tests are failing.

@mathisloge
Copy link
Collaborator

Mhm... weird that the database won't be found.
Should check somehow, if the build/vcpkg_installed/x64-osx/share/proj is there. Maybe just uploading the folder as an artifact?

@hummeltech
Copy link
Contributor Author

hummeltech commented May 6, 2024

@mathisloge, I see the problem, I didn't realize the environment variable for PROJ_LIB was hard-coded into the preset. I created two presets for macOS, one for AMD64, one for ARM64 and the tests are now passing. Thanks for the pointer!

Copy link
Collaborator

@mathisloge mathisloge left a comment

Choose a reason for hiding this comment

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

Great!

@artemp artemp merged commit f89f221 into mapnik:master May 6, 2024
8 checks passed
@hummeltech hummeltech deleted the macOSCI branch May 6, 2024 12:39
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.

None yet

3 participants