From a46187dcb674f92f1b23ab52da47a42e0252f081 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Mon, 4 Nov 2024 23:59:30 -0600 Subject: [PATCH 1/7] GHActions: Adjust MoltenVK build path to match updated MoltenVK --- .github/workflows/macos_build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 03f4c9015fa6..e02db0456a33 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -65,9 +65,10 @@ jobs: git apply ../Externals/MoltenVK/patches/*.patch ./fetchDependencies --macos make macos - chmod 755 Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib + ls -l Package/Release/MoltenVK/dynamic/* + chmod 755 Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib mkdir -p "$HOME/moltenvk/lib/" - mv Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib "$HOME/moltenvk/lib/" + mv Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$HOME/moltenvk/lib/" popd rm -rf mvk-build From 58e4af3598e1c986bc83cad97faeaa8bcbe37659 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Wed, 6 Nov 2024 01:19:25 -0600 Subject: [PATCH 2/7] GHActions: Dolphin.app was renamed to DolphinQt.app --- .github/workflows/macos_build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index e02db0456a33..3216aba60512 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -142,8 +142,8 @@ jobs: PR_NUM: ${{ github.event.pull_request.number }} PR_SHA: ${{ github.event.pull_request.head.sha }} run: | - lipo -create build/Binaries/Dolphin.app/Contents/MacOS/Dolphin build-arm/Binaries/Dolphin.app/Contents/MacOS/Dolphin -o dolphin - mv dolphin build/Binaries/Dolphin.app/Contents/MacOS/Dolphin + lipo -create build/Binaries/DolphinQt.app/Contents/MacOS/DolphinQt build-arm/Binaries/DolphinQt.app/Contents/MacOS/DolphinQt -o dolphin + mv dolphin build/Binaries/DolphinQt.app/Contents/MacOS/DolphinQt TAG="$(git tag --points-at HEAD)" if [ ! -z "$TAG" ]; then SUFFIX="$TAG" @@ -155,7 +155,7 @@ jobs: SUFFIX="sha[$(git rev-parse --short HEAD)]" fi APPNAME="PrimeHack-$SUFFIX" - mv build/Binaries/Dolphin.app "$APPNAME.app" + mv build/Binaries/DolphinQt.app "$APPNAME.app" tar cvzf "$APPNAME.tar.gz" "$APPNAME.app" echo "name=$APPNAME" >> "$GITHUB_OUTPUT" From 90f775a3ecf31855674dc270a62520c04b24e16e Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Wed, 6 Nov 2024 02:27:13 -0600 Subject: [PATCH 3/7] GHActions: Stop using Python 3.11 MoltenVK has fixed their build process --- .github/workflows/macos_build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 3216aba60512..7744b92dc1c1 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -19,11 +19,6 @@ jobs: with: submodules: recursive - # MoltenVK's build process breaks on Python 3.12 - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Install Packages env: HOMEBREW_NO_INSTALL_CLEANUP: 1 From b4bfedb7b7fdb7d693273c2249d59a57318bb318 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Wed, 6 Nov 2024 18:39:49 -0600 Subject: [PATCH 4/7] GHActions: Build with Ninja Makefile build doesn't properly generate Info.plist --- .github/workflows/macos_build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 7744b92dc1c1..5f9bab182d17 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -24,9 +24,9 @@ jobs: HOMEBREW_NO_INSTALL_CLEANUP: 1 HOMEBREW_NO_ANALYTICS: 1 run: | - if ! brew install ccache; then + if ! brew install ccache ninja; then brew update - brew install ccache + brew install ccache ninja fi - name: Cache Dependencies @@ -96,6 +96,7 @@ jobs: -DUSE_SYSTEM_ICONV=ON -DUSE_SYSTEM_LIBLZMA=ON -DUSE_SYSTEM_SDL2=ON + -GNinja ) cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 \ @@ -117,7 +118,7 @@ jobs: ccache -p ccache -s ccache -z - make -j$(getconf _NPROCESSORS_ONLN) dolphin-emu + ninja dolphin-emu ccache -s - name: Build Dolphin (arm64) @@ -126,7 +127,7 @@ jobs: ccache -p ccache -s ccache -z - make -j$(getconf _NPROCESSORS_ONLN) dolphin-emu + ninja dolphin-emu ccache -s - name: Prepare Build Artifacts From 50d17653d29f816a8bdc9ed071682a5d1e6010f7 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Wed, 6 Nov 2024 20:32:20 -0600 Subject: [PATCH 5/7] GHActions: Use tar xz --- .github/workflows/macos_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 5f9bab182d17..a4cca492b269 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -152,11 +152,11 @@ jobs: fi APPNAME="PrimeHack-$SUFFIX" mv build/Binaries/DolphinQt.app "$APPNAME.app" - tar cvzf "$APPNAME.tar.gz" "$APPNAME.app" + tar --options xz:compression-level=9 -cvJf "$APPNAME.tar.xz" "$APPNAME.app" echo "name=$APPNAME" >> "$GITHUB_OUTPUT" - name: Upload Artifact uses: actions/upload-artifact@v4 with: name: ${{ steps.create-artifact.outputs.name }} - path: "*.tar.gz" + path: "*.tar.xz" From cb3385530a568124ca50c827d652674f0e95e2bc Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Wed, 6 Nov 2024 21:21:48 -0600 Subject: [PATCH 6/7] GHActions: Don't use system liblzma It doesn't ship with macOS --- .github/workflows/macos_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index a4cca492b269..31b6bb8ea6d7 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -94,7 +94,6 @@ jobs: -DUSE_SYSTEM_BZIP2=ON -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_ICONV=ON - -DUSE_SYSTEM_LIBLZMA=ON -DUSE_SYSTEM_SDL2=ON -GNinja ) From 87dcf56b98c14a0dc78b4ddd9c66ca85c8251d26 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Wed, 6 Nov 2024 20:40:06 -0600 Subject: [PATCH 7/7] GHActions: Update dependencies --- .../workflows/scripts/macos/build-dependencies.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/scripts/macos/build-dependencies.sh b/.github/workflows/scripts/macos/build-dependencies.sh index 82cb67c08bac..d1d07b6dde6f 100755 --- a/.github/workflows/scripts/macos/build-dependencies.sh +++ b/.github/workflows/scripts/macos/build-dependencies.sh @@ -5,8 +5,8 @@ set -e export MACOSX_DEPLOYMENT_TARGET=10.15 INSTALLDIR="$HOME/deps" NPROCS="$(getconf _NPROCESSORS_ONLN)" -SDL=SDL2-2.30.2 -QT=6.2.8 +SDL=SDL2-2.30.9 +QT=6.2.10 QT_SUFFIX=-opensource mkdir deps-build @@ -18,11 +18,11 @@ export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS" export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS" cat > SHASUMS <