Run build only on merge request
This commit is contained in:
parent
1ec5f9da56
commit
4ea11c4b09
|
@ -31,7 +31,7 @@ check_tag:
|
||||||
build_cloudflared_macos: &build
|
build_cloudflared_macos: &build
|
||||||
stage: build
|
stage: build
|
||||||
rules:
|
rules:
|
||||||
- if: '$CI_COMMIT_BRANCH != "master"'
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
when: always
|
when: always
|
||||||
- when: never
|
- when: never
|
||||||
dependencies:
|
dependencies:
|
||||||
|
|
|
@ -167,9 +167,12 @@ rm -rf "${TARGET_DIRECTORY}"
|
||||||
export TARGET_OS="darwin"
|
export TARGET_OS="darwin"
|
||||||
GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
|
GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
|
||||||
|
|
||||||
|
|
||||||
# This allows apple tools to use the certificates in the keychain without requiring password input.
|
# This allows apple tools to use the certificates in the keychain without requiring password input.
|
||||||
# This command always needs to run after the certificates have been loaded into the keychain
|
# This command always needs to run after the certificates have been loaded into the keychain
|
||||||
|
if [[ ! -z "$CFD_CODE_SIGN_PASS" ]]; then
|
||||||
security set-key-partition-list -S apple-tool:,apple: -s -k "${CFD_CODE_SIGN_PASS}" cloudflared_build_keychain
|
security set-key-partition-list -S apple-tool:,apple: -s -k "${CFD_CODE_SIGN_PASS}" cloudflared_build_keychain
|
||||||
|
fi
|
||||||
|
|
||||||
# sign the cloudflared binary
|
# sign the cloudflared binary
|
||||||
if [[ ! -z "$CODE_SIGN_NAME" ]]; then
|
if [[ ! -z "$CODE_SIGN_NAME" ]]; then
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -239,7 +239,7 @@ github-release:
|
||||||
|
|
||||||
.PHONY: macos-release
|
.PHONY: macos-release
|
||||||
macos-release:
|
macos-release:
|
||||||
- python3 github_release.py --path $(PWD)/artifacts/ --release-version $(VERSION) --draft --dry-run
|
- python3 github_release.py --path $(PWD)/artifacts/ --release-version $(VERSION)
|
||||||
|
|
||||||
.PHONY: r2-linux-release
|
.PHONY: r2-linux-release
|
||||||
r2-linux-release:
|
r2-linux-release:
|
||||||
|
|
Loading…
Reference in New Issue