Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 05:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CI: Fix/re-enable Mac builds

Browse source 
Credit to TellowKrinkle for debugging the QtNetwork build issue.
This commit is contained in:
Connor McLaughlin 2022-10-08 21:32:46 +10:00
parent 42768c3101
commit 5fa7960c31
2 changed files with 44 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
.github/workflows/rolling-release.yml vendored
View file

@ -220,47 +220,46 @@ jobs:
# path: "build/duckstation-qt-x64.AppImage.zsync" # path: "build/duckstation-qt-x64.AppImage.zsync"
# macos-build: macos-build:
# runs-on: macos-11 runs-on: macos-11
# steps: steps:
# - uses: actions/checkout@v2.3.1 - uses: actions/checkout@v2.3.1
# with: with:
# fetch-depth: 0 fetch-depth: 0
#
# - name: Install packages - name: Install packages
# shell: bash shell: bash
# run: | run: |
# brew install curl ninja brew install curl ninja
#
# - name: Cache Dependencies - name: Cache Dependencies
# id: cache-deps-mac id: cache-deps-mac
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: ~/deps path: ~/deps
# key: deps-mac ${{ hashFiles('scripts/build-dependencies-mac.sh') }} key: deps-mac ${{ hashFiles('scripts/build-dependencies-mac.sh') }}
#
# - name: Build Dependencies - name: Build Dependencies
# if: steps.cache-deps-mac.outputs.cache-hit != 'true' if: steps.cache-deps-mac.outputs.cache-hit != 'true'
# run: scripts/build-dependencies-mac.sh run: scripts/build-dependencies-mac.sh
#
# - name: Compile and zip .app - name: Compile and zip .app
# shell: bash shell: bash
# run: | run: |
# mkdir build mkdir build
# cd build cd build
# ../scripts/make-universal-macos-binary.sh .. ../scripts/make-universal-macos-binary.sh ..
# zip -r duckstation-mac-release.zip DuckStation.app/ zip -r duckstation-mac-release.zip DuckStation.app/
#
# - name: Upload macOS .app - name: Upload macOS .app
# uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
# with: with:
# name: "macos" name: "macos"
# path: "build/duckstation-mac-release.zip" path: "build/duckstation-mac-release.zip"
create-release: create-release:
#needs: [windows-build, windows-arm64-build, linux-build, macos-build] needs: [windows-build, windows-arm64-build, linux-build, macos-build]
needs: [windows-build, windows-arm64-build, linux-build]
runs-on: "ubuntu-20.04" runs-on: "ubuntu-20.04"
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
steps: steps:
@ -289,10 +288,10 @@ jobs:
with: with:
name: "linux-x64-appimage-qt" name: "linux-x64-appimage-qt"
# - name: Download MacOS Artifact - name: Download MacOS Artifact
# uses: actions/download-artifact@v1 uses: actions/download-artifact@v1
# with: with:
# name: "macos" name: "macos"
- name: Create preview release - name: Create preview release
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
@ -308,7 +307,7 @@ jobs:
windows-arm64/duckstation-windows-arm64-release.zip windows-arm64/duckstation-windows-arm64-release.zip
windows-arm64/duckstation-windows-arm64-release-symbols.zip windows-arm64/duckstation-windows-arm64-release-symbols.zip
linux-x64-appimage-qt/DuckStation-x64.AppImage linux-x64-appimage-qt/DuckStation-x64.AppImage
# macos/duckstation-mac-release.zip macos/duckstation-mac-release.zip
# linux-x64-appimage-qt/duckstation-qt-x64.AppImage # linux-x64-appimage-qt/duckstation-qt-x64.AppImage
# linux-x64-appimage-qt-zsync/duckstation-qt-x64.AppImage.zsync # linux-x64-appimage-qt-zsync/duckstation-qt-x64.AppImage.zsync
# linux-x64-appimage-nogui/duckstation-nogui-x64.AppImage # linux-x64-appimage-nogui/duckstation-nogui-x64.AppImage
@ -328,7 +327,7 @@ jobs:
windows-arm64/duckstation-windows-arm64-release.zip windows-arm64/duckstation-windows-arm64-release.zip
windows-arm64/duckstation-windows-arm64-release-symbols.zip windows-arm64/duckstation-windows-arm64-release-symbols.zip
linux-x64-appimage-qt/DuckStation-x64.AppImage linux-x64-appimage-qt/DuckStation-x64.AppImage
# macos/duckstation-mac-release.zip macos/duckstation-mac-release.zip
# linux-x64-appimage-qt/duckstation-qt-x64.AppImage # linux-x64-appimage-qt/duckstation-qt-x64.AppImage
# linux-x64-appimage-qt-zsync/duckstation-qt-x64.AppImage.zsync # linux-x64-appimage-qt-zsync/duckstation-qt-x64.AppImage.zsync
# linux-x64-appimage-nogui/duckstation-nogui-x64.AppImage # linux-x64-appimage-nogui/duckstation-nogui-x64.AppImage

2
scripts/build-dependencies-mac.sh
View file

@ -123,7 +123,7 @@ tar xf "qtbase-everywhere-src-$QT.tar.xz"
cd "qtbase-everywhere-src-$QT" cd "qtbase-everywhere-src-$QT"
mkdir build mkdir build
cd build cd build
cmake -G Ninja -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 .. cmake -G Ninja -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 ..
cmake --build . --parallel cmake --build . --parallel
cmake --install . cmake --install .
cd ../../ cd ../../