diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa2c1ab9b2..a2557b9b68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,6 +45,24 @@ experimental: - build/artifacts/Telegram.DSYMs.zip expire_in: 1 week +experimental: + tags: + - ios_internal + stage: build + only: + - experimental-2 + except: + - tags + script: + - bash buildbox/build-telegram.sh appcenter-experimental-2 + - bash buildbox/deploy-telegram.sh appcenter-experimental-2 + environment: + name: experimental-2 + artifacts: + paths: + - build/artifacts/Telegram.DSYMs.zip + expire_in: 1 week + beta_testflight: tags: - ios_beta diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh index c3c22037ba..c5afe51b13 100644 --- a/buildbox/build-telegram.sh +++ b/buildbox/build-telegram.sh @@ -57,7 +57,7 @@ cp "$BUCK" "tools/buck" BUILD_CONFIGURATION="$1" -if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental" ]; then +if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental-2" ]; then CODESIGNING_SUBPATH="transient-data/codesigning" CODESIGNING_TEAMS_SUBPATH="transient-data/teams" elif [ "$BUILD_CONFIGURATION" == "appstore" ]; then @@ -89,7 +89,7 @@ fi BASE_DIR=$(pwd) -if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental" ] || [ "$BUILD_CONFIGURATION" == "appstore" ]; then +if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental-2" ] || [ "$BUILD_CONFIGURATION" == "appstore" ]; then if [ ! `which setup-telegram-build.sh` ]; then echo "setup-telegram-build.sh not found in PATH $PATH" exit 1 @@ -103,7 +103,7 @@ if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "app source `which setup-codesigning.sh` CODESIGNING_CONFIGURATION="$BUILD_CONFIGURATION" - if [ "$BUILD_CONFIGURATION" == "appcenter-experimental" ]; then + if [ "$BUILD_CONFIGURATION" == "appcenter-experimental" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental-2" ]; then CODESIGNING_CONFIGURATION="hockeyapp" fi diff --git a/buildbox/deploy-telegram.sh b/buildbox/deploy-telegram.sh index 470c632aa8..f1bf2e7e4d 100644 --- a/buildbox/deploy-telegram.sh +++ b/buildbox/deploy-telegram.sh @@ -31,7 +31,7 @@ else BUILD_NUMBER="$2" fi -if [ "$CONFIGURATION" == "hockeyapp" ] || [ "$CONFIGURATION" == "appcenter-experimental" ]; then +if [ "$CONFIGURATION" == "hockeyapp" ] || [ "$CONFIGURATION" == "appcenter-experimental" ] || [ "$CONFIGURATION" == "appcenter-experimental-2" ]; then FASTLANE_PASSWORD="" FASTLANE_ITC_TEAM_NAME="" elif [ "$CONFIGURATION" == "appstore" ]; then @@ -62,6 +62,6 @@ if [ "$1" == "appstore" ]; then FASTLANE_PASSWORD="$FASTLANE_PASSWORD" xcrun altool --upload-app --type ios --file "$IPA_PATH" --username "$FASTLANE_ITC_USERNAME" --password "@env:FASTLANE_PASSWORD" elif [ "$1" == "hockeyapp" ]; then API_USER_NAME="$API_USER_NAME" API_APP_NAME="$API_APP_NAME" API_TOKEN="$API_TOKEN" sh buildbox/deploy-appcenter.sh -elif [ "$1" == "appcenter-experimental" ]; then +elif [ "$1" == "appcenter-experimental" ] || [ "$1" == "appcenter-experimental-2" ]; then API_USER_NAME="$API_USER_NAME" API_APP_NAME="$API_APP_NAME" API_TOKEN="$API_TOKEN" sh buildbox/deploy-appcenter.sh fi diff --git a/buildbox/guest-build-telegram.sh b/buildbox/guest-build-telegram.sh index c9d62e4594..9f47254d9c 100644 --- a/buildbox/guest-build-telegram.sh +++ b/buildbox/guest-build-telegram.sh @@ -12,7 +12,7 @@ if [ -z "COMMIT_ID" ]; then exit 1 fi -if [ "$1" == "hockeyapp" ] || [ "$1" == "appcenter-experimental" ] || [ "$1" == "testinghockeyapp" ]; then +if [ "$1" == "hockeyapp" ] || [ "$1" == "appcenter-experimental" ] || [ "$1" == "appcenter-experimental-2" ] || [ "$1" == "testinghockeyapp" ]; then CERTS_PATH="$HOME/codesigning_data/certs" PROFILES_PATH="$HOME/codesigning_data/profiles" elif [ "$1" == "testinghockeyapp-local" ]; then @@ -122,6 +122,8 @@ fi if [ "$1" == "appcenter-experimental" ]; then export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_ID" +elif [ "$1" == "appcenter-experimental-2" ]; then + export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_2_ID" fi BUCK="$(pwd)/tools/buck" BUCK_HTTP_CACHE="$BUCK_HTTP_CACHE" BUCK_CACHE_MODE="$BUCK_CACHE_MODE" BUCK_DIR_CACHE="$BUCK_DIR_CACHE" LOCAL_CODESIGNING=1 sh "$BUILD_ENV_SCRIPT" make "$APP_TARGET"