diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh index d0ff50c5..2a62e928 100755 --- a/.ci/macos/notarize.sh +++ b/.ci/macos/notarize.sh @@ -11,6 +11,7 @@ PATH="/usr/local/opt/qt@5/bin/:${PATH}" security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain if [ "${CI_PIPELINE_TRIGGERED}" ]; then + echo "cirrus build id: ${TRIGGER_BUILD_ID}" cat "${TRIGGER_PAYLOAD}" fi diff --git a/.cirrus.yml b/.cirrus.yml index b0ef50bc..c46c3ff7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,6 +2,9 @@ task: macos_instance: image: ghcr.io/cirruslabs/macos-monterey-xcode:13 name: Build - macOS Apple Silicon + only_if: $CIRRUS_REPO_OWNER == 'Nheko-Reborn' + environment: + GITLAB_TRIGGER_TOKEN: ENCRYPTED[!5fb4bbdecbde3b2c766ac7383dca573cd5ec8b815c5ac9bede0cadfe9ad70ecd3e64b1728f7840da087099f3fc1fd4f7!] homebrew_script: - brew bundle --file .ci/macos/Brewfile build_script: @@ -24,5 +27,14 @@ task: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 - cmake --build build - (cd build && git clone https://github.com/Nheko-Reborn/qt-jdenticon.git && cd qt-jdenticon && qmake && make -j 4 && cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS) + zip_script: + - zip -r build/nheko.app build/nheko.zip + gitlab_script: + - curl -X POST + --fail + -F token="${GITLAB_TRIGGER_TOKEN}" + -F ref="${CIRRUS_BRANCH}" + -F "variables[TRIGGER_BUILD_ID]=${CIRRUS_BUILD_ID}" + "https://nheko.im/api/v4/projects/2/trigger/pipeline" binaries_artifacts: - path: build/nheko.app \ No newline at end of file + path: build/nheko.zip \ No newline at end of file