From 3dd3314111d019b2f7b6d41c66bf68fdfda40641 Mon Sep 17 00:00:00 2001
From: Ali <>
Date: Wed, 28 Oct 2020 18:52:39 +0400
Subject: [PATCH] WIP

---
 .gitignore                       |  1 +
 buildbox/build-telegram.sh       | 16 ++++++++--------
 buildbox/guest-build-telegram.sh |  6 +-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b0487bbc48..20745b9461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ DerivedData
 buck-out/*
 .buckd/*
 tools/buck
+tools/bazel
 AppBinary.xcworkspace/*
 Project.xcodeproj/*
 Watch/Watch.xcodeproj/*
diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh
index d7acc5af35..ca08ea6eaa 100644
--- a/buildbox/build-telegram.sh
+++ b/buildbox/build-telegram.sh
@@ -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=""
     ;;
 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=\"$BAZEL_HTTP_CACHE\"; $GUEST_SHELL -l guest-build-telegram.sh $BUILD_CONFIGURATION" || true
 
 OUTPUT_PATH="build/artifacts"
 rm -rf "$OUTPUT_PATH"
diff --git a/buildbox/guest-build-telegram.sh b/buildbox/guest-build-telegram.sh
index 4a24d45c59..c66d0c29bb 100644
--- a/buildbox/guest-build-telegram.sh
+++ b/buildbox/guest-build-telegram.sh
@@ -116,17 +116,13 @@ 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="$BAZEL_HTTP_CACHE" LOCAL_CODESIGNING=1 sh "$BUILD_ENV_SCRIPT" make "$APP_TARGET"
 
 OUTPUT_PATH="build/artifacts"
 rm -rf "$OUTPUT_PATH"