From 229f5359d8ec2a74622ca8fa17e7df77819c0aed Mon Sep 17 00:00:00 2001 From: Ali <> Date: Thu, 21 Nov 2019 00:00:29 +0400 Subject: [PATCH] Try again --- .gitlab-ci.yml | 34 +++++++++++++++++++++------------- buildbox/build-telegram.sh | 10 ++++++++-- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9619491d8f..01e9d6be44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ stages: - build - #- deploy + - deploy - verifysanity - verify @@ -53,18 +53,22 @@ beta_testflight: # environment: # name: testflight_llc -#verifysanity_beta_testflight: -# tags: -# - ios_beta -# stage: verifysanity -# only: -# - beta -# except: -# - tags -# script: -# - bash buildbox/verify-telegram.sh appstore cached -# environment: -# name: testflight_llc +verifysanity_beta_testflight: + tags: + - ios_beta + stage: verifysanity + only: + - beta + except: + - tags + script: + - bash buildbox/verify-telegram.sh appstore cached + environment: + name: testflight_llc + artifacts: + paths: + - build/artifacts + expire_in: 1 week verify_beta_testflight: tags: @@ -78,3 +82,7 @@ verify_beta_testflight: - bash buildbox/verify-telegram.sh appstore full environment: name: testflight_llc + artifacts: + paths: + - build/artifacts + expire_in: 1 week diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh index 7aa409ef61..c58df8318d 100644 --- a/buildbox/build-telegram.sh +++ b/buildbox/build-telegram.sh @@ -62,7 +62,6 @@ if [ "$BUILD_CONFIGURATION" == "hockeyapp" ]; then elif [ "$BUILD_CONFIGURATION" == "appstore" ]; then CODESIGNING_SUBPATH="transient-data/codesigning" CODESIGNING_TEAMS_SUBPATH="transient-data/teams" - export BUCK_HTTP_CACHE="" elif [ "$BUILD_CONFIGURATION" == "verify" ]; then CODESIGNING_SUBPATH="fake-codesigning" else @@ -70,7 +69,14 @@ else exit 1 fi -COMMIT_ID=$(git rev-parse HEAD) +COMMIT_COMMENT="$(git log -1 --pretty=%B)" +case "$COMMIT_COMMENT" in + *"[nocache]"*) + export BUCK_HTTP_CACHE="" + ;; +esac + +COMMIT_ID="$(git rev-parse HEAD)" COMMIT_AUTHOR=$(git log -1 --pretty=format:'%an') if [ -z "$2" ]; then COMMIT_COUNT=$(git rev-list --count HEAD)