From 65106f7a0185f7f50ada98d74a10e71d498ecd57 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Sat, 16 Jan 2021 02:15:19 +0400 Subject: [PATCH] Temporarily ignore xcode version on CI --- buildbox/build-telegram.sh | 4 ++-- buildbox/guest-build-telegram.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh index f3c1569bec..c1e4905153 100644 --- a/buildbox/build-telegram.sh +++ b/buildbox/build-telegram.sh @@ -5,7 +5,7 @@ set -e BUILD_TELEGRAM_VERSION="1" MACOS_VERSION="10.15" -XCODE_VERSION="12.2" +XCODE_VERSION="12.3" GUEST_SHELL="bash" VM_BASE_NAME="macos$(echo $MACOS_VERSION | sed -e 's/\.'/_/g)_Xcode$(echo $XCODE_VERSION | sed -e 's/\.'/_/g)" @@ -100,7 +100,7 @@ if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "app case "$BUILD_CONFIGURATION" in "hockeyapp") - generate-configuration.sh internal development "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning" "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration" + generate-configuration.sh internal release "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning" "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration" ;; *) diff --git a/buildbox/guest-build-telegram.sh b/buildbox/guest-build-telegram.sh index d540abab4d..381d0f5270 100644 --- a/buildbox/guest-build-telegram.sh +++ b/buildbox/guest-build-telegram.sh @@ -130,6 +130,7 @@ fi #PATH="$PATH:$(pwd)/tools" BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" LOCAL_CODESIGNING=1 sh "$BUILD_ENV_SCRIPT" make "$APP_TARGET" python3 build-system/Make/Make.py \ + --overrideXcodeVersion \ --bazel="$(pwd)/tools/bazel" \ --cacheHost="$BAZEL_HTTP_CACHE_URL" \ build \