This commit is contained in:
Ali 2020-10-28 18:52:39 +04:00
parent 6bf81425ee
commit 3dd3314111
3 changed files with 10 additions and 13 deletions

1
.gitignore vendored
View File

@ -27,6 +27,7 @@ DerivedData
buck-out/* buck-out/*
.buckd/* .buckd/*
tools/buck tools/buck
tools/bazel
AppBinary.xcworkspace/* AppBinary.xcworkspace/*
Project.xcodeproj/* Project.xcodeproj/*
Watch/Watch.xcodeproj/* Watch/Watch.xcodeproj/*

View File

@ -38,13 +38,13 @@ if [ `which cleanup-telegram-build-vms.sh` ]; then
cleanup-telegram-build-vms.sh cleanup-telegram-build-vms.sh
fi fi
if [ -z "$BUCK" ]; then if [ -z "$BAZEL" ]; then
echo "BUCK is not defined" echo "BAZEL is not defined"
exit 1 exit 1
fi fi
if [ ! -f "$BUCK" ]; then if [ ! -f "$BAZEL" ]; then
echo "buck not found at $BUCK" echo "bazel not found at $BAZEL"
exit 1 exit 1
fi fi
@ -52,8 +52,8 @@ BUILDBOX_DIR="buildbox"
mkdir -p "$BUILDBOX_DIR/transient-data" mkdir -p "$BUILDBOX_DIR/transient-data"
rm -f "tools/buck" rm -f "tools/bazel"
cp "$BUCK" "tools/buck" cp "$BAZEL" "tools/bazel"
BUILD_CONFIGURATION="$1" BUILD_CONFIGURATION="$1"
@ -73,7 +73,7 @@ fi
COMMIT_COMMENT="$(git log -1 --pretty=%B)" COMMIT_COMMENT="$(git log -1 --pretty=%B)"
case "$COMMIT_COMMENT" in case "$COMMIT_COMMENT" in
*"[nocache]"*) *"[nocache]"*)
export BUCK_HTTP_CACHE="" export BAZEL_HTTP_CACHE=""
;; ;;
esac esac
@ -195,7 +195,7 @@ else
fi 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": 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" OUTPUT_PATH="build/artifacts"
rm -rf "$OUTPUT_PATH" rm -rf "$OUTPUT_PATH"

View File

@ -116,17 +116,13 @@ else
exit 1 exit 1
fi fi
if [ -d "$BUCK_DIR_CACHE" ]; then
sudo chown telegram "$BUCK_DIR_CACHE"
fi
if [ "$1" == "appcenter-experimental" ]; then if [ "$1" == "appcenter-experimental" ]; then
export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_ID" export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_ID"
elif [ "$1" == "appcenter-experimental-2" ]; then elif [ "$1" == "appcenter-experimental-2" ]; then
export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_2_ID" export APP_CENTER_ID="$APP_CENTER_EXPERIMENTAL_2_ID"
fi 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" OUTPUT_PATH="build/artifacts"
rm -rf "$OUTPUT_PATH" rm -rf "$OUTPUT_PATH"