Merge commit '41bcbd14f0' into beta

buildbox/build-telegram.sh

@@ -5,7 +5,7 @@ set -e
 BUILD_TELEGRAM_VERSION="1"
 
 MACOS_VERSION="10.15"
-XCODE_VERSION="12.0.1"
+XCODE_VERSION="12.1"
 GUEST_SHELL="bash"
 
 VM_BASE_NAME="macos$(echo $MACOS_VERSION | sed -e 's/\.'/_/g)_Xcode$(echo $XCODE_VERSION | sed -e 's/\.'/_/g)"
@@ -38,13 +38,13 @@ if [ `which cleanup-telegram-build-vms.sh` ]; then
 	cleanup-telegram-build-vms.sh
 fi
 
-if [ -z "$BUCK" ]; then
-	echo "BUCK is not defined"
+if [ -z "$BAZEL" ]; then
+	echo "BAZEL is not defined"
 	exit 1
 fi
 
-if [ ! -f "$BUCK" ]; then
-	echo "buck not found at $BUCK"
+if [ ! -f "$BAZEL" ]; then
+	echo "bazel not found at $BAZEL"
 	exit 1
 fi
 
@@ -52,8 +52,8 @@ BUILDBOX_DIR="buildbox"
 
 mkdir -p "$BUILDBOX_DIR/transient-data"
 
-rm -f "tools/buck"
-cp "$BUCK" "tools/buck"
+rm -f "tools/bazel"
+cp "$BAZEL" "tools/bazel"
 
 BUILD_CONFIGURATION="$1"
 
@@ -73,7 +73,7 @@ fi
 COMMIT_COMMENT="$(git log -1 --pretty=%B)"
 case "$COMMIT_COMMENT" in 
   *"[nocache]"*)
-	export BUCK_HTTP_CACHE=""
+	export BAZEL_HTTP_CACHE_URL=""
     ;;
 esac
 
@@ -195,7 +195,7 @@ else
 fi
 scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/guest-build-telegram.sh" "$BUILDBOX_DIR/transient-data/source.tar" telegram@"$VM_IP":
 
-ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null telegram@"$VM_IP" -o ServerAliveInterval=60 -t "export TELEGRAM_BUILD_APPSTORE_PASSWORD=\"$TELEGRAM_BUILD_APPSTORE_PASSWORD\"; export TELEGRAM_BUILD_APPSTORE_TEAM_NAME=\"$TELEGRAM_BUILD_APPSTORE_TEAM_NAME\"; export TELEGRAM_BUILD_APPSTORE_USERNAME=\"$TELEGRAM_BUILD_APPSTORE_USERNAME\"; export BUILD_NUMBER=\"$BUILD_NUMBER\"; export COMMIT_ID=\"$COMMIT_ID\"; export COMMIT_AUTHOR=\"$COMMIT_AUTHOR\"; export BUCK_HTTP_CACHE=\"$BUCK_HTTP_CACHE\"; export BUCK_DIR_CACHE=\"$BUCK_DIR_CACHE\"; export BUCK_CACHE_MODE=\"$BUCK_CACHE_MODE\"; $GUEST_SHELL -l guest-build-telegram.sh $BUILD_CONFIGURATION" || true
+ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null telegram@"$VM_IP" -o ServerAliveInterval=60 -t "export TELEGRAM_BUILD_APPSTORE_PASSWORD=\"$TELEGRAM_BUILD_APPSTORE_PASSWORD\"; export TELEGRAM_BUILD_APPSTORE_TEAM_NAME=\"$TELEGRAM_BUILD_APPSTORE_TEAM_NAME\"; export TELEGRAM_BUILD_APPSTORE_USERNAME=\"$TELEGRAM_BUILD_APPSTORE_USERNAME\"; export BUILD_NUMBER=\"$BUILD_NUMBER\"; export COMMIT_ID=\"$COMMIT_ID\"; export COMMIT_AUTHOR=\"$COMMIT_AUTHOR\"; export BAZEL_HTTP_CACHE_URL=\"$BAZEL_HTTP_CACHE_URL\"; $GUEST_SHELL -l guest-build-telegram.sh $BUILD_CONFIGURATION" || true
 
 OUTPUT_PATH="build/artifacts"
 rm -rf "$OUTPUT_PATH"
@@ -208,8 +208,9 @@ if [ -z "$RUNNING_VM" ]; then
 		virsh destroy "$VM_NAME"
 		virsh undefine "$VM_NAME" --remove-all-storage --nvram
 	elif [ "$BUILD_MACHINE" == "macOS" ]; then
-		prlctl stop "$VM_NAME" --kill
-		prlctl delete "$VM_NAME"
+		echo "Deleting VM..."
+		#prlctl stop "$VM_NAME" --kill
+		#prlctl delete "$VM_NAME"
 	fi
 fi
 

buildbox/generate_fake_codesigning.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-

buildbox/guest-build-telegram.sh

@@ -85,8 +85,12 @@ BASE_DIR=$(pwd)
 cd "$SOURCE_PATH"
 tar -xf "../source.tar"
 
-for f in $(ls "$CERTS_PATH"); do
-	security import "$CERTS_PATH/$f" -k "$MY_KEYCHAIN" -P "" -T /usr/bin/codesign -T /usr/bin/security
+for f in "$CERTS_PATH"/*.p12; do
+	security import "$f" -k "$MY_KEYCHAIN" -P "" -T /usr/bin/codesign -T /usr/bin/security
+done
+
+for f in "$CERTS_PATH"/*.cer; do
+	sudo security add-trusted-cert -d -r trustRoot -p codeSign -k "$MY_KEYCHAIN" "$f"
 done
 
 security set-key-partition-list -S apple-tool:,apple: -k "$MY_KEYCHAIN_PASSWORD" "$MY_KEYCHAIN"
@@ -101,13 +105,13 @@ done
 
 if [ "$1" == "hockeyapp" ] || [ "$1" == "appcenter-experimental" ] || [ "$1" == "appcenter-experimental-2" ]; then
 	BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/internal.sh"
-	APP_TARGET="app_arm64"
+	APP_TARGET="bazel_app_arm64"
 elif [ "$1" == "appstore" ]; then
 	BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/appstore.sh"
-	APP_TARGET="app"
+	APP_TARGET="bazel_app"
 elif [ "$1" == "verify" ]; then
 	BUILD_ENV_SCRIPT="build-system/verify.sh"
-	APP_TARGET="app"
+	APP_TARGET="bazel_app"
 	export CODESIGNING_DATA_PATH="build-system/fake-codesigning"
 	export CODESIGNING_CERTS_VARIANT="distribution"
 	export CODESIGNING_PROFILES_VARIANT="appstore"
@@ -116,23 +120,27 @@ else
 	exit 1
 fi
 
-if [ -d "$BUCK_DIR_CACHE" ]; then
-	sudo chown telegram "$BUCK_DIR_CACHE"
-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"
+PATH="$PATH:$(pwd)/tools" BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" LOCAL_CODESIGNING=1 sh "$BUILD_ENV_SCRIPT" make "$APP_TARGET"
 
 OUTPUT_PATH="build/artifacts"
 rm -rf "$OUTPUT_PATH"
 mkdir -p "$OUTPUT_PATH"
 
-cp "build/Telegram_signed.ipa" "./$OUTPUT_PATH/Telegram.ipa"
-cp "build/DSYMs.zip" "./$OUTPUT_PATH/Telegram.DSYMs.zip"
+for f in bazel-out/applebin_ios-ios_arm*-opt-ST-*/bin/Telegram/Telegram.ipa; do
+	cp "$f" $OUTPUT_PATH/
+done
+
+mkdir -p build/DSYMs
+for f in bazel-out/applebin_ios-ios_arm*-opt-ST-*/bin/Telegram/*.dSYM; do
+	cp -R "$f" build/DSYMs/
+done
+
+zip -r "./$OUTPUT_PATH/Telegram.DSYMs.zip" build/DSYMs 1>/dev/null
 
 cd "$BASE_DIR"

buildbox/verify-telegram.sh

@@ -12,10 +12,10 @@ if [ -z "$CONFIGURATION" ] || [ -z "$MODE" ] ; then
 fi
 
 if [ "$MODE" == "cached" ]; then
-	BUCK_HTTP_CACHE="$BUCK_HTTP_CACHE"
+	BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL"
 	ERROR_OUTPUT_PATH="build/verifysanity_artifacts"
 elif [ "$MODE" == "full" ]; then
-	BUCK_HTTP_CACHE=""
+	BAZEL_HTTP_CACHE_URL=""
 	ERROR_OUTPUT_PATH="build/verify_artifacts"
 else
 	echo "Unknown mode $MODE"
@@ -25,7 +25,9 @@ fi
 OUTPUT_PATH="build/artifacts"
 
 if [ "$CONFIGURATION" == "appstore" ]; then
-	IPA_PATH="$OUTPUT_PATH/Telegram.ipa"
+	if [ -z "$IPA_PATH" ]; then
+		IPA_PATH="$OUTPUT_PATH/Telegram.ipa"
+	fi
 else
 	echo "Unknown configuration $CONFIGURATION"
 	exit 1
@@ -38,9 +40,10 @@ fi
 
 VERIFY_PATH="TelegramVerifyBuild.ipa"
 
-mv "$IPA_PATH" "$VERIFY_PATH"
+rm -f "$VERIFY_PATH"
+cp "$IPA_PATH" "$VERIFY_PATH"
 
-BUCK_HTTP_CACHE="$BUCK_HTTP_CACHE" sh buildbox/build-telegram.sh verify
+BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" sh buildbox/build-telegram.sh verify
 
 python3 tools/ipadiff.py "$IPA_PATH" "$VERIFY_PATH"
 retVal=$?