Fix macOS CI #2075
Merged
Fix macOS CI #2075
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lmoureaux
force-pushed
the
bugfix/ci-update
branch
2 times, most recently
from
88c5409
to
4e2a3cd
Compare
lmoureaux
added a commit
to lmoureaux/freeciv21
that referenced
this pull request
Dec 15, 2023
Also remove broken debugging code from the macOS build config. See longturn#2075.
lmoureaux
added a commit
to lmoureaux/freeciv21
that referenced
this pull request
Dec 15, 2023
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
added a commit
to lmoureaux/freeciv21
that referenced
this pull request
Dec 15, 2023
Recommend opening an issue to check them. See longturn#2075.
Also remove broken debugging code from the macOS build config. See longturn#2075.
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.
In case it fails to create an image, make sure it tells us why.
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.
Recommend opening an issue to check them. See longturn#2075.
lmoureaux
force-pushed
the
bugfix/ci-update
branch
from
6e32763
to
c778696
Compare
|
Is there a way for us to have the windows clang CI run to ensure we don't break anything there? If not, I can run on my local as a test. |
|
I am also suggesting we do a squash merge |
Triggering a run in my fork. -> https://github.com/lmoureaux/freeciv21/actions/runs/7229577730, passed 🟢
I condensed the commit history in just 5 self-contained changes, shouldn't be necessary. |
jwrober
pushed a commit
that referenced
this pull request
Dec 16, 2023
Also remove broken debugging code from the macOS build config. See #2075.
jwrober
pushed a commit
that referenced
this pull request
Dec 16, 2023
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 #2075.
lmoureaux
added a commit
that referenced
this pull request
Dec 17, 2023
Also remove broken debugging code from the macOS build config. See #2075.
lmoureaux
added a commit
that referenced
this pull request
Dec 17, 2023
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 #2075.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes multiple failures in the macOS CI. See commits for some more info
Closes #2069