From 6cd87427e5eb09f910fa1e51c43e6c7e6ea28bb2 Mon Sep 17 00:00:00 2001
From: Ali <>
Date: Sat, 16 Jan 2021 01:50:22 +0400
Subject: [PATCH] Trying to make it work

---
 build-system/Make/Make.py        | 12 +++++++-----
 buildbox/build-telegram.sh       | 18 +++++++++--------
 buildbox/guest-build-telegram.sh | 33 ++++++++++++++++++++------------
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/build-system/Make/Make.py b/build-system/Make/Make.py
index 6ba6140765..758aa00414 100644
--- a/build-system/Make/Make.py
+++ b/build-system/Make/Make.py
@@ -5,6 +5,7 @@ import os
 import shlex
 import sys
 import tempfile
+import subprocess
 
 from BuildEnvironment import is_apple_silicon, resolve_executable, call_executable, BuildEnvironment
 from ProjectGeneration import generate
@@ -181,7 +182,7 @@ class BazelCommandLine:
         if self.remote_cache is not None:
             combined_arguments += [
                 '--remote_cache={}'.format(self.remote_cache),
-                '--experimental_remote_downloader="{}"'.format(self.remote_cache)
+                '--experimental_remote_downloader={}'.format(self.remote_cache)
             ]
         elif self.cache_dir is not None:
             combined_arguments += [
@@ -211,7 +212,7 @@ class BazelCommandLine:
         if self.remote_cache is not None:
             combined_arguments += [
                 '--remote_cache={}'.format(self.remote_cache),
-                '--experimental_remote_downloader="{}"'.format(self.remote_cache)
+                '--experimental_remote_downloader={}'.format(self.remote_cache)
             ]
         elif self.cache_dir is not None:
             combined_arguments += [
@@ -220,7 +221,8 @@ class BazelCommandLine:
 
         combined_arguments += self.configuration_args
 
-        print('TelegramBuild: running {}'.format(combined_arguments))
+        print('TelegramBuild: running')
+        print(subprocess.list2cmdline(combined_arguments))
         call_executable(combined_arguments)
 
 
@@ -280,7 +282,7 @@ def generate_project(arguments):
     if arguments.cacheDir is not None:
         bazel_command_line.add_cache_dir(arguments.cacheDir)
     elif arguments.cacheHost is not None:
-        bazel_command_line.add_remote_cache(arguments.cacheDir)
+        bazel_command_line.add_remote_cache(arguments.cacheHost)
 
     resolve_configuration(bazel_command_line, arguments)
 
@@ -311,7 +313,7 @@ def build(arguments):
     if arguments.cacheDir is not None:
         bazel_command_line.add_cache_dir(arguments.cacheDir)
     elif arguments.cacheHost is not None:
-        bazel_command_line.add_remote_cache(arguments.cacheDir)
+        bazel_command_line.add_remote_cache(arguments.cacheHost)
 
     resolve_configuration(bazel_command_line, arguments)
 
diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh
index 2beb7b4a11..f3c1569bec 100644
--- a/buildbox/build-telegram.sh
+++ b/buildbox/build-telegram.sh
@@ -58,7 +58,7 @@ cp "$BAZEL" "tools/bazel"
 BUILD_CONFIGURATION="$1"
 
 if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental-2" ]; then
-	CODESIGNING_SUBPATH="transient-data/codesigning"
+	CODESIGNING_SUBPATH="transient-data/telegram-codesigning/codesigning"
 	CODESIGNING_TEAMS_SUBPATH="transient-data/teams"
 elif [ "$BUILD_CONFIGURATION" == "appstore" ]; then
 	CODESIGNING_SUBPATH="transient-data/codesigning"
@@ -95,11 +95,12 @@ if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "app
 		exit 1
 	fi
 
+	mkdir -p "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning"
 	mkdir -p "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration"
 
 	case "$BUILD_CONFIGURATION" in
 		"hockeyapp")
-			generate-configuration.sh internal development "$BASE_DIR/$BUILDBOX_DIR/telegram-codesigning" "$BASE_DIR/$BUILDBOX_DIR/transient-data"
+			generate-configuration.sh internal development "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning" "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration"
 			;;
 
 		*)
@@ -182,13 +183,14 @@ elif [ "$BUILD_MACHINE" == "macOS" ]; then
 fi
 
 scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/$CODESIGNING_SUBPATH" telegram@"$VM_IP":codesigning_data
-scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/$CODESIGNING_TEAMS_SUBPATH" telegram@"$VM_IP":codesigning_teams
+scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration" telegram@"$VM_IP":telegram-configuration
+#scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/$CODESIGNING_TEAMS_SUBPATH" telegram@"$VM_IP":codesigning_teams
 
-if [ "$BUILD_CONFIGURATION" == "verify" ]; then
-	ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null telegram@"$VM_IP" -o ServerAliveInterval=60 -t "mkdir -p telegram-ios-shared/fastlane; echo '' > telegram-ios-shared/fastlane/Fastfile"
-else
-	scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/transient-data/telegram-ios-shared" telegram@"$VM_IP":telegram-ios-shared
-fi
+#if [ "$BUILD_CONFIGURATION" == "verify" ]; then
+#	ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null telegram@"$VM_IP" -o ServerAliveInterval=60 -t "mkdir -p telegram-ios-shared/fastlane; echo '' > telegram-ios-shared/fastlane/Fastfile"
+#else
+#	scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/transient-data/telegram-ios-shared" telegram@"$VM_IP":telegram-ios-shared
+#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 BAZEL_HTTP_CACHE_URL=\"$BAZEL_HTTP_CACHE_URL\"; $GUEST_SHELL -l guest-build-telegram.sh $BUILD_CONFIGURATION" || true
diff --git a/buildbox/guest-build-telegram.sh b/buildbox/guest-build-telegram.sh
index 3e4681311c..d540abab4d 100644
--- a/buildbox/guest-build-telegram.sh
+++ b/buildbox/guest-build-telegram.sh
@@ -13,8 +13,8 @@ if [ -z "COMMIT_ID" ]; then
 fi
 
 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"
+	CERTS_PATH="$HOME/codesigning_data/certs/enterprise"
+	#PROFILES_PATH="$HOME/codesigning_data/profiles"
 elif [ "$1" == "testinghockeyapp-local" ]; then
 	CERTS_PATH="$HOME/codesigning_data/certs"
 	PROFILES_PATH="$HOME/codesigning_data/profiles"
@@ -79,7 +79,7 @@ echo "Unpacking files..."
 
 mkdir -p "$SOURCE_PATH/buildbox"
 mkdir -p "$SOURCE_PATH/buildbox/transient-data"
-cp -r "$HOME/codesigning_teams" "$SOURCE_PATH/buildbox/transient-data/teams"
+#cp -r "$HOME/codesigning_teams" "$SOURCE_PATH/buildbox/transient-data/teams"
 
 BASE_DIR=$(pwd)
 cd "$SOURCE_PATH"
@@ -95,17 +95,18 @@ done
 
 security set-key-partition-list -S apple-tool:,apple: -k "$MY_KEYCHAIN_PASSWORD" "$MY_KEYCHAIN"
 
-mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+#mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
 
-for f in $(ls "$PROFILES_PATH"); do
-	PROFILE_PATH="$PROFILES_PATH/$f"
-	uuid=`grep UUID -A1 -a "$PROFILE_PATH" | grep -io "[-A-F0-9]\{36\}"`
-	cp -f "$PROFILE_PATH" "$HOME/Library/MobileDevice/Provisioning Profiles/$uuid.mobileprovision"
-done
+#for f in $(ls "$PROFILES_PATH"); do
+#	PROFILE_PATH="$PROFILES_PATH/$f"
+#	uuid=`grep UUID -A1 -a "$PROFILE_PATH" | grep -io "[-A-F0-9]\{36\}"`
+#	cp -f "$PROFILE_PATH" "$HOME/Library/MobileDevice/Provisioning Profiles/$uuid.mobileprovision"
+#done
 
 if [ "$1" == "hockeyapp" ] || [ "$1" == "appcenter-experimental" ] || [ "$1" == "appcenter-experimental-2" ]; then
-	BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/internal.sh"
-	APP_TARGET="bazel_app_arm64"
+	#BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/internal.sh"
+	#APP_TARGET="bazel_app_arm64"
+	echo "" >> /dev/null
 elif [ "$1" == "appstore" ]; then
 	BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/appstore.sh"
 	APP_TARGET="bazel_app"
@@ -126,7 +127,15 @@ elif [ "$1" == "appcenter-experimental-2" ]; then
 	export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_2_ID"
 fi
 
-PATH="$PATH:$(pwd)/tools" BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" 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"
+
+python3 build-system/Make/Make.py \
+    --bazel="$(pwd)/tools/bazel" \
+    --cacheHost="$BAZEL_HTTP_CACHE_URL" \
+    build \
+    --configurationPath="$HOME/telegram-configuration" \
+    --buildNumber="$BUILD_NUMBER" \
+    --configuration=release_arm64
 
 OUTPUT_PATH="build/artifacts"
 rm -rf "$OUTPUT_PATH"