Update macOS runner to use official binaries

pull/1531/head
Joseph Donofry 1 year ago
parent d08535efbb
commit 6909ec1096
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
  1. 2
      .ci/macos/Brewfile
  2. 5
      .ci/macos/build.sh
  3. 2
      .ci/macos/notarize.sh
  4. 2
      .gitlab-ci.yml

@ -6,7 +6,7 @@ brew "clang-format"
brew "cmake" brew "cmake"
brew "ninja" brew "ninja"
brew "openssl" brew "openssl"
brew "qt6" # brew "qt6"
brew "nlohmann_json" brew "nlohmann_json"
brew "gstreamer" brew "gstreamer"
brew "qtkeychain" brew "qtkeychain"

@ -6,10 +6,10 @@ set -ue
#TAG=$(git tag -l --points-at HEAD) #TAG=$(git tag -l --points-at HEAD)
# Add Qt binaries to path # Add Qt binaries to path
PATH="$(brew --prefix qt6)/bin/:${PATH}" PATH="/Users/jdonof/Qt/6.5.1/macos/bin/:${PATH}"
export PATH export PATH
CMAKE_PREFIX_PATH="$(brew --prefix qt6)" CMAKE_PREFIX_PATH="/Users/jdonof/Qt/6.5.1/macos/lib/cmake"
export CMAKE_PREFIX_PATH export CMAKE_PREFIX_PATH
cmake -GNinja -S. -Bbuild \ cmake -GNinja -S. -Bbuild \
@ -19,6 +19,7 @@ cmake -GNinja -S. -Bbuild \
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
-DUSE_BUNDLED_OPENSSL=ON \ -DUSE_BUNDLED_OPENSSL=ON \
-DQt6_DIR=/Users/jdonof/Qt/6.5.1/macos/lib/cmake \
-DCI_BUILD=ON -DCI_BUILD=ON
cmake --build build cmake --build build
cmake --install build cmake --install build

@ -6,7 +6,7 @@ set -u
# https://forum.qt.io/topic/96652/how-to-notarize-qt-application-on-macos/18 # https://forum.qt.io/topic/96652/how-to-notarize-qt-application-on-macos/18
# Add Qt binaries to path # Add Qt binaries to path
PATH="/usr/local/opt/qt@6/bin/:${PATH}" PATH="/Users/jdonof/Qt/6.5.1/macos/bin/:${PATH}"
export PATH export PATH
security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain

@ -173,7 +173,7 @@ codesign-macos:
before_script: before_script:
- pip3 install dmgbuild - pip3 install dmgbuild
script: script:
- export PATH=/usr/local/opt/qt@5/bin/:${PATH} - export PATH=/Users/jdonof/Qt/6.5.1/macos/bin:${PATH}
- ./.ci/macos/notarize.sh - ./.ci/macos/notarize.sh
after_script: after_script:
- ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg

Loading…
Cancel
Save