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.

Sign up for GitHub

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

Jump to bottom

Fix macOS CI #2075

Merged
merged 5 commits into from
Dec 16, 2023
Merged

Fix macOS CI #2075

merged 5 commits into from
Dec 16, 2023

Commits on Dec 15, 2023

  1. Update the vcpkg version hash 

    Also remove broken debugging code from the macOS build config.
See longturn#2075.
    @lmoureaux
    lmoureaux committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    5a37a5e View commit details
    Browse the repository at this point in the history

  2. Force the Python version on the macOS CI 

    This is needed to work around a bug in the meson build system used by
fontconfig, which is pulled as a dependency by vcpkg.

See longturn#2069.
    @lmoureaux
    lmoureaux committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    0e1abcb View commit details
    Browse the repository at this point in the history

  3. macOS CI: make hdiutil more verbose 

    In case it fails to create an image, make sure it tells us why.
    @lmoureaux
    lmoureaux committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    09ddd75 View commit details
    Browse the repository at this point in the history

  4. Remove custom FindSDL2.cmake 

    SDL2 supports CMake natively and installs an SDL2Config.cmake file. Hence we do
not need a find module. The custom module was not handling linking to macOS
frameworks, which was hard coded into client CMakeLists.txt instead. Just
switch to the native module, which does all of this for us natively.

See longturn#2075.
    @lmoureaux
    lmoureaux committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    8416eee View commit details
    Browse the repository at this point in the history

  5. Add documentation about workarounds 

    Recommend opening an issue to check them.

See longturn#2075.
    @lmoureaux
    lmoureaux committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    c778696 View commit details
    Browse the repository at this point in the history