Skip to content

Commit 7f4b4a2

Browse files
author
Ali
committed
Simplify build scripts
1 parent 271c7d3 commit 7f4b4a2

File tree

2 files changed

+18
-69
lines changed

2 files changed

+18
-69
lines changed

‎buildbox/build-telegram.sh

+11-22
Original file line numberDiff line numberDiff line change
@@ -99,30 +99,25 @@ if [ "$BUILD_CONFIGURATION" == "hockeyapp" ] || [ "$BUILD_CONFIGURATION" == "app
9999
mkdir -p "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration"
100100

101101
case "$BUILD_CONFIGURATION" in
102-
"hockeyapp")
102+
"hockeyapp"|"appcenter-experimental"|"appcenter-experimental-2")
103103
generate-configuration.sh internal release "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning" "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration"
104104
;;
105105

106+
"appstore")
107+
generate-configuration.sh appstore release "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning" "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration"
108+
;;
109+
106110
*)
107111
echo "Unknown build configuration $BUILD_CONFIGURATION"
108112
exit 1
109113
;;
110114
esac
115+
elif [ "$BUILD_CONFIGURATION" == "verify" ]; then
116+
mkdir -p "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning"
117+
mkdir -p "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration"
111118

112-
if [ "$BUILD_CONFIGURATION" == "appstore" ]; then
113-
if [ -z "$TELEGRAM_BUILD_APPSTORE_PASSWORD" ]; then
114-
echo "TELEGRAM_BUILD_APPSTORE_PASSWORD is not set"
115-
exit 1
116-
fi
117-
if [ -z "$TELEGRAM_BUILD_APPSTORE_TEAM_NAME" ]; then
118-
echo "TELEGRAM_BUILD_APPSTORE_TEAM_NAME is not set"
119-
exit 1
120-
fi
121-
if [ -z "$TELEGRAM_BUILD_APPSTORE_USERNAME" ]; then
122-
echo "TELEGRAM_BUILD_APPSTORE_USERNAME is not set"
123-
exit 1
124-
fi
125-
fi
119+
cp -R fake-codesigning/* "$BASE_DIR/$BUILDBOX_DIR/transient-data/telegram-codesigning/"
120+
cp -R build-system/example-configuration/* "$BASE_DIR/$BUILDBOX_DIR/transient-data/build-configuration/"
126121
fi
127122

128123
if [ ! -d "$BUILDBOX_DIR/$CODESIGNING_SUBPATH" ]; then
@@ -184,16 +179,10 @@ fi
184179

185180
scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/$CODESIGNING_SUBPATH" telegram@"$VM_IP":codesigning_data
186181
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
188182

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
194183
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":
195184

196-
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
185+
ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null telegram@"$VM_IP" -o ServerAliveInterval=60 -t "export BUILD_NUMBER=\"$BUILD_NUMBER\"; export BAZEL_HTTP_CACHE_URL=\"$BAZEL_HTTP_CACHE_URL\"; $GUEST_SHELL -l guest-build-telegram.sh $BUILD_CONFIGURATION" || true
197186

198187
OUTPUT_PATH="build/artifacts"
199188
rm -rf "$OUTPUT_PATH"

‎buildbox/guest-build-telegram.sh

+7-47
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,14 @@ if [ -z "BUILD_NUMBER" ]; then
77
exit 1
88
fi
99

10-
if [ -z "COMMIT_ID" ]; then
11-
echo "COMMIT_ID is not set"
12-
exit 1
13-
fi
14-
1510
if [ "$1" == "hockeyapp" ] || [ "$1" == "appcenter-experimental" ] || [ "$1" == "appcenter-experimental-2" ] || [ "$1" == "testinghockeyapp" ]; then
1611
CERTS_PATH="$HOME/codesigning_data/certs/enterprise"
17-
#PROFILES_PATH="$HOME/codesigning_data/profiles"
1812
elif [ "$1" == "testinghockeyapp-local" ]; then
19-
CERTS_PATH="$HOME/codesigning_data/certs"
20-
PROFILES_PATH="$HOME/codesigning_data/profiles"
13+
CERTS_PATH="$HOME/codesigning_data/certs/enterprise"
2114
elif [ "$1" == "appstore" ]; then
22-
if [ -z "$TELEGRAM_BUILD_APPSTORE_PASSWORD" ]; then
23-
echo "TELEGRAM_BUILD_APPSTORE_PASSWORD is not set"
24-
exit 1
25-
fi
26-
if [ -z "$TELEGRAM_BUILD_APPSTORE_TEAM_NAME" ]; then
27-
echo "TELEGRAM_BUILD_APPSTORE_TEAM_NAME is not set"
28-
exit 1
29-
fi
30-
CERTS_PATH="$HOME/codesigning_data/certs"
31-
PROFILES_PATH="$HOME/codesigning_data/profiles"
15+
CERTS_PATH="$HOME/codesigning_data/certs/distribution"
3216
elif [ "$1" == "verify" ]; then
33-
CERTS_PATH="build-system/fake-codesigning/certs/distribution"
34-
PROFILES_PATH="build-system/fake-codesigning/profiles"
17+
CERTS_PATH="$HOME/codesigning_data/certs/distribution"
3518
else
3619
echo "Unknown configuration $1"
3720
exit 1
@@ -95,47 +78,24 @@ done
9578

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

98-
#mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
99-
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
105-
10681
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"
109-
echo "" >> /dev/null
82+
APP_CONFIGURATION="release_arm64"
11083
elif [ "$1" == "appstore" ]; then
111-
BUILD_ENV_SCRIPT="../telegram-ios-shared/buildbox/bin/appstore.sh"
112-
APP_TARGET="bazel_app"
84+
APP_CONFIGURATION="release_universal"
11385
elif [ "$1" == "verify" ]; then
114-
BUILD_ENV_SCRIPT="build-system/verify.sh"
115-
APP_TARGET="bazel_app"
116-
export CODESIGNING_DATA_PATH="build-system/fake-codesigning"
117-
export CODESIGNING_CERTS_VARIANT="distribution"
118-
export CODESIGNING_PROFILES_VARIANT="appstore"
86+
APP_CONFIGURATION="release_universal"
11987
else
12088
echo "Unsupported configuration $1"
12189
exit 1
12290
fi
12391

124-
if [ "$1" == "appcenter-experimental" ]; then
125-
export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_ID"
126-
elif [ "$1" == "appcenter-experimental-2" ]; then
127-
export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_2_ID"
128-
fi
129-
130-
#PATH="$PATH:$(pwd)/tools" BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" LOCAL_CODESIGNING=1 sh "$BUILD_ENV_SCRIPT" make "$APP_TARGET"
131-
13292
python3 build-system/Make/Make.py \
13393
--bazel="$(pwd)/tools/bazel" \
13494
--cacheHost="$BAZEL_HTTP_CACHE_URL" \
13595
build \
13696
--configurationPath="$HOME/telegram-configuration" \
13797
--buildNumber="$BUILD_NUMBER" \
138-
--configuration=release_arm64
98+
--configuration="$APP_CONFIGURATION"
13999

140100
OUTPUT_PATH="build/artifacts"
141101
rm -rf "$OUTPUT_PATH"

0 commit comments

Comments
 (0)