summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2022-10-27 18:55:52 -0400
committerJoseph Donofry <joedonofry@gmail.com>2022-10-27 18:55:52 -0400
commitc6c8ac092bf972d6f61bfb5a2e79b6b3273c6444 (patch)
tree08a6cf9b28dbfddfd1c0ac8cc0eefad4cc93462b
parentMerge branch 'cirrus_ci_apple_silicon' into 'master' (diff)
downloadnheko-c6c8ac092bf972d6f61bfb5a2e79b6b3273c6444.tar.xz
Fix conditional checks
-rwxr-xr-x.ci/macos/notarize.sh2
-rw-r--r--.gitlab-ci.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh

index 7a67306d..2757d44c 100755 --- a/.ci/macos/notarize.sh +++ b/.ci/macos/notarize.sh
@@ -11,7 +11,7 @@ export PATH security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain -if [ "${CI_PIPELINE_TRIGGERED}" ] && [ "${TRIGGERED_BY}" = "cirrus" ]; then +if [ -n "${CI_PIPELINE_TRIGGERED:-}" ] && [ "${TRIGGERED_BY:-}" = "cirrus" ]; then echo "cirrus build id: ${TRIGGER_BUILD_ID}" cat "${TRIGGER_PAYLOAD}" # download the build artifacts from cirrus api diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e172d5c..8d6fc82b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml
@@ -153,7 +153,7 @@ codesign-macos: rules: - if : '$CI_COMMIT_BRANCH == "master"' - if : $CI_COMMIT_TAG - - if : '$CI_PIPELINE_TRIGGERED && $CI_COMMIT_REF_PROTECTED' + - if : '$CI_PIPELINE_TRIGGERED && $CI_COMMIT_REF_PROTECTED == "true"' variables: PLAT: "m1" artifacts: