Skip to content

Commit 6cd8742

Browse files
author
Ali
committed
Trying to make it work
1 parent 820a243 commit 6cd8742

File tree

3 files changed

+39
-26
lines changed

3 files changed

+39
-26
lines changed

‎build-system/Make/Make.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import shlex
66
import sys
77
import tempfile
8+
import subprocess
89

910
from BuildEnvironment import is_apple_silicon, resolve_executable, call_executable, BuildEnvironment
1011
from ProjectGeneration import generate
@@ -181,7 +182,7 @@ def get_project_generation_arguments(self):
181182
if self.remote_cache is not None:
182183
combined_arguments += [
183184
'--remote_cache={}'.format(self.remote_cache),
184-
'--experimental_remote_downloader="{}"'.format(self.remote_cache)
185+
'--experimental_remote_downloader={}'.format(self.remote_cache)
185186
]
186187
elif self.cache_dir is not None:
187188
combined_arguments += [
@@ -211,7 +212,7 @@ def invoke_build(self):
211212
if self.remote_cache is not None:
212213
combined_arguments += [
213214
'--remote_cache={}'.format(self.remote_cache),
214-
'--experimental_remote_downloader="{}"'.format(self.remote_cache)
215+
'--experimental_remote_downloader={}'.format(self.remote_cache)
215216
]
216217
elif self.cache_dir is not None:
217218
combined_arguments += [
@@ -220,7 +221,8 @@ def invoke_build(self):
220221

221222
combined_arguments += self.configuration_args
222223

223-
print('TelegramBuild: running {}'.format(combined_arguments))
224+
print('TelegramBuild: running')
225+
print(subprocess.list2cmdline(combined_arguments))
224226
call_executable(combined_arguments)
225227

226228

@@ -280,7 +282,7 @@ def generate_project(arguments):
280282
if arguments.cacheDir is not None:
281283
bazel_command_line.add_cache_dir(arguments.cacheDir)
282284
elif arguments.cacheHost is not None:
283-
bazel_command_line.add_remote_cache(arguments.cacheDir)
285+
bazel_command_line.add_remote_cache(arguments.cacheHost)
284286

285287
resolve_configuration(bazel_command_line, arguments)
286288

@@ -311,7 +313,7 @@ def build(arguments):
311313
if arguments.cacheDir is not None:
312314
bazel_command_line.add_cache_dir(arguments.cacheDir)
313315
elif arguments.cacheHost is not None:
314-
bazel_command_line.add_remote_cache(arguments.cacheDir)
316+
bazel_command_line.add_remote_cache(arguments.cacheHost)
315317

316318
resolve_configuration(bazel_command_line, arguments)
317319

‎buildbox/build-telegram.sh

+11-9
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ cp "$BAZEL" "tools/bazel"
5858
BUILD_CONFIGURATION="$1"
5959

6060
if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental" ] || [ "$BUILD_CONFIGURATION" == "appcenter-experimental-2" ]; then
61-
CODESIGNING_SUBPATH="transient-data/codesigning"
61+
CODESIGNING_SUBPATH="transient-data/telegram-codesigning/codesigning"
6262
CODESIGNING_TEAMS_SUBPATH="transient-data/teams"
6363
elif [ "$BUILD_CONFIGURATION" == "appstore" ]; then
6464
CODESIGNING_SUBPATH="transient-data/codesigning"
@@ -95,11 +95,12 @@ if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "app
9595
exit 1
9696
fi
9797

98+
mkdir -p "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning"
9899
mkdir -p "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration"
99100

100101
case "$BUILD_CONFIGURATION" in
101102
"hockeyapp")
102-
generate-configuration.sh internal development "$BASE_DIR/$BUILDBOX_DIR/telegram-codesigning" "$BASE_DIR/$BUILDBOX_DIR/transient-data"
103+
generate-configuration.sh internal development "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning" "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration"
103104
;;
104105

105106
*)
@@ -182,13 +183,14 @@ elif [ "$BUILD_MACHINE" == "macOS" ]; then
182183
fi
183184

184185
scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/$CODESIGNING_SUBPATH" telegram@"$VM_IP":codesigning_data
185-
scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/$CODESIGNING_TEAMS_SUBPATH" telegram@"$VM_IP":codesigning_teams
186-
187-
if [ "$BUILD_CONFIGURATION" == "verify" ]; then
188-
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"
189-
else
190-
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
191-
fi
186+
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
187+
#scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/$CODESIGNING_TEAMS_SUBPATH" telegram@"$VM_IP":codesigning_teams
188+
189+
#if [ "$BUILD_CONFIGURATION" == "verify" ]; then
190+
# 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"
191+
#else
192+
# 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
193+
#fi
192194
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":
193195

194196
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

‎buildbox/guest-build-telegram.sh

+21-12
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if [ -z "COMMIT_ID" ]; then
1313
fi
1414

1515
if [ "$1" == "hockeyapp" ] || [ "$1" == "appcenter-experimental" ] || [ "$1" == "appcenter-experimental-2" ] || [ "$1" == "testinghockeyapp" ]; then
16-
CERTS_PATH="$HOME/codesigning_data/certs"
17-
PROFILES_PATH="$HOME/codesigning_data/profiles"
16+
CERTS_PATH="$HOME/codesigning_data/certs/enterprise"
17+
#PROFILES_PATH="$HOME/codesigning_data/profiles"
1818
elif [ "$1" == "testinghockeyapp-local" ]; then
1919
CERTS_PATH="$HOME/codesigning_data/certs"
2020
PROFILES_PATH="$HOME/codesigning_data/profiles"
@@ -79,7 +79,7 @@ echo "Unpacking files..."
7979

8080
mkdir -p "$SOURCE_PATH/buildbox"
8181
mkdir -p "$SOURCE_PATH/buildbox/transient-data"
82-
cp -r "$HOME/codesigning_teams" "$SOURCE_PATH/buildbox/transient-data/teams"
82+
#cp -r "$HOME/codesigning_teams" "$SOURCE_PATH/buildbox/transient-data/teams"
8383

8484
BASE_DIR=$(pwd)
8585
cd "$SOURCE_PATH"
@@ -95,17 +95,18 @@ done
9595

9696
security set-key-partition-list -S apple-tool:,apple: -k "$MY_KEYCHAIN_PASSWORD" "$MY_KEYCHAIN"
9797

98-
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
98+
#mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
9999

100-
for f in $(ls "$PROFILES_PATH"); do
101-
PROFILE_PATH="$PROFILES_PATH/$f"
102-
uuid=`grep UUID -A1 -a "$PROFILE_PATH" | grep -io "[-A-F0-9]\{36\}"`
103-
cp -f "$PROFILE_PATH" "$HOME/Library/MobileDevice/Provisioning Profiles/$uuid.mobileprovision"
104-
done
100+
#for f in $(ls "$PROFILES_PATH"); do
101+
# PROFILE_PATH="$PROFILES_PATH/$f"
102+
# uuid=`grep UUID -A1 -a "$PROFILE_PATH" | grep -io "[-A-F0-9]\{36\}"`
103+
# cp -f "$PROFILE_PATH" "$HOME/Library/MobileDevice/Provisioning Profiles/$uuid.mobileprovision"
104+
#done
105105

106106
if [ "$1" == "hockeyapp" ] || [ "$1" == "appcenter-experimental" ] || [ "$1" == "appcenter-experimental-2" ]; then
107-
BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/internal.sh"
108-
APP_TARGET="bazel_app_arm64"
107+
#BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/internal.sh"
108+
#APP_TARGET="bazel_app_arm64"
109+
echo "" >> /dev/null
109110
elif [ "$1" == "appstore" ]; then
110111
BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/appstore.sh"
111112
APP_TARGET="bazel_app"
@@ -126,7 +127,15 @@ elif [ "$1" == "appcenter-experimental-2" ]; then
126127
export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_2_ID"
127128
fi
128129

129-
PATH="$PATH:$(pwd)/tools" BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" LOCAL_CODESIGNING=1 sh "$BUILD_ENV_SCRIPT" make "$APP_TARGET"
130+
#PATH="$PATH:$(pwd)/tools" BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" LOCAL_CODESIGNING=1 sh "$BUILD_ENV_SCRIPT" make "$APP_TARGET"
131+
132+
python3 build-system/Make/Make.py \
133+
--bazel="$(pwd)/tools/bazel" \
134+
--cacheHost="$BAZEL_HTTP_CACHE_URL" \
135+
build \
136+
--configurationPath="$HOME/telegram-configuration" \
137+
--buildNumber="$BUILD_NUMBER" \
138+
--configuration=release_arm64
130139

131140
OUTPUT_PATH="build/artifacts"
132141
rm -rf "$OUTPUT_PATH"

0 commit comments

Comments
 (0)