Skip to content

Commit 05b6f06

Browse files
Fix Mac CI build (shiiion#152)
* GHActions:mac: Fix MoltenVK build * GHActions: Update SDL to 2.28.5 * GHActions: Update Qt to 6.2.7 * GHActions: Use /archive/ links for Qt
1 parent d65c10e commit 05b6f06

2 files changed

Lines changed: 18 additions & 12 deletions

File tree

.github/workflows/macos_build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
with:
2020
submodules: recursive
2121

22+
# MoltenVK's build process breaks on Python 3.12
23+
- uses: actions/setup-python@v4
24+
with:
25+
python-version: '3.11'
26+
2227
- name: Install Packages
2328
env:
2429
HOMEBREW_NO_INSTALL_CLEANUP: 1

.github/workflows/scripts/macos/build-dependencies.sh

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ set -e
55
export MACOSX_DEPLOYMENT_TARGET=10.15
66
INSTALLDIR="$HOME/deps"
77
NPROCS="$(getconf _NPROCESSORS_ONLN)"
8-
SDL=SDL2-2.26.0
9-
QT=6.2.4
8+
SDL=SDL2-2.28.5
9+
QT=6.2.7
10+
QT_SUFFIX=-opensource
1011

1112
mkdir deps-build
1213
cd deps-build
@@ -17,17 +18,17 @@ export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS"
1718
export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
1819

1920
cat > SHASUMS <<EOF
20-
8000d7169febce93c84b6bdf376631f8179132fd69f7015d4dadb8b9c2bdb295 $SDL.tar.gz
21-
d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634 qtbase-everywhere-src-$QT.tar.xz
22-
17f40689c4a1706a1b7db22fa92f6ab79f7b698a89e100cab4d10e19335f8267 qttools-everywhere-src-$QT.tar.xz
23-
bd1aac74a892c60b2f147b6d53bb5b55ab7a6409e63097d38198933f8024fa51 qttranslations-everywhere-src-$QT.tar.xz
21+
332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4 $SDL.tar.gz
22+
fa31da768fc05e18d2f82e41e05c2d60beba38bca2909bb099ce5834c3314610 qtbase-everywhere$QT_SUFFIX-src-$QT.tar.xz
23+
605583d5773b1f35d8fc7572137867b30de7de95c512a0a635c886f0c9b6fe12 qttools-everywhere$QT_SUFFIX-src-$QT.tar.xz
24+
e825d92dc9c5e3bc4738b08fcc817895e491b5c31b9b96b1d56fc39e6817a270 qttranslations-everywhere$QT_SUFFIX-src-$QT.tar.xz
2425
EOF
2526

2627
curl -L \
2728
-O "https://libsdl.org/release/$SDL.tar.gz" \
28-
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
29-
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
30-
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
29+
-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere$QT_SUFFIX-src-$QT.tar.xz" \
30+
-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttools-everywhere$QT_SUFFIX-src-$QT.tar.xz" \
31+
-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere$QT_SUFFIX-src-$QT.tar.xz" \
3132

3233
shasum -a 256 --check SHASUMS
3334

@@ -40,15 +41,15 @@ make install
4041
cd ..
4142

4243
echo "Installing Qt Base..."
43-
tar xf "qtbase-everywhere-src-$QT.tar.xz"
44+
tar xf "qtbase-everywhere$QT_SUFFIX-src-$QT.tar.xz"
4445
cd "qtbase-everywhere-src-$QT"
4546
cmake -B build -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_optimize_size=ON -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_MESSAGE_LOG_LEVEL=STATUS
4647
make -C build "-j$NPROCS"
4748
make -C build install
4849
cd ..
4950

5051
echo "Installing Qt Tools..."
51-
tar xf "qttools-everywhere-src-$QT.tar.xz"
52+
tar xf "qttools-everywhere$QT_SUFFIX-src-$QT.tar.xz"
5253
cd "qttools-everywhere-src-$QT"
5354
# Linguist relies on a library in the Designer target, which takes 5-7 minutes to build on the CI
5455
# Avoid it by not building Linguist, since we only need the tools that come with it
@@ -70,7 +71,7 @@ make -C build install
7071
cd ..
7172

7273
echo "Installing Qt Translations..."
73-
tar xf "qttranslations-everywhere-src-$QT.tar.xz"
74+
tar xf "qttranslations-everywhere$QT_SUFFIX-src-$QT.tar.xz"
7475
cd "qttranslations-everywhere-src-$QT"
7576
cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release
7677
make -C build "-j$NPROCS"

0 commit comments

Comments
 (0)