diff options
| author | Joe Donofry <rubberduckie3554@gmail.com> | 2024-02-27 20:35:00 +0000 |
|---|---|---|
| committer | Joe Donofry <rubberduckie3554@gmail.com> | 2024-02-27 20:35:00 +0000 |
| commit | a280ccfb50fc4c92f09b0f583fa8857f65887c8f (patch) | |
| tree | 2e6f2d82b5c189742efa245aa46a0e4f74ca0e4f /.ci | |
| parent | Fix gitlab ci syntax error (diff) | |
| download | nheko-a280ccfb50fc4c92f09b0f583fa8857f65887c8f.tar.xz | |
Gitlab Apple Silicon Runner
Also update macOS pip usage to pipx due to recent homebrew changes
Diffstat (limited to '.ci')
| -rw-r--r-- | .ci/macos/Brewfile | 1 | ||||
| -rwxr-xr-x | .ci/macos/build.sh | 2 | ||||
| -rwxr-xr-x | .ci/macos/notarize.sh | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/.ci/macos/Brewfile b/.ci/macos/Brewfile index 84036fed..171cc0a4 100644 --- a/.ci/macos/Brewfile +++ b/.ci/macos/Brewfile @@ -10,3 +10,4 @@ brew "openssl" brew "nlohmann_json" brew "gstreamer" brew "qtkeychain" +brew "pipx" diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh index ea6da16d..7d1d9143 100755 --- a/.ci/macos/build.sh +++ b/.ci/macos/build.sh @@ -8,6 +8,8 @@ set -ue # Add Qt binaries to path QT_BASEPATH=(${HOME}/Qt/6.*/macos/) PATH="${QT_BASEPATH}/bin/:${PATH}" +pipx ensurepath +. ~/.zshrc export PATH CMAKE_PREFIX_PATH="${QT_BASEPATH}/lib/cmake" diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh index b0c05154..f8c905ea 100755 --- a/.ci/macos/notarize.sh +++ b/.ci/macos/notarize.sh @@ -7,6 +7,8 @@ set -u # Add Qt binaries to path export QTPATH=(${PATH}/Qt/6.*/macos/bin) +pipx ensurepath +. ~/.zshrc export PATH=${QTPATH}:${PATH} security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain |