diff --git a/Makefile b/Makefile index 1fc0dc1ba8..256960fd26 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,8 @@ BAZEL_COMMON_FLAGS=\ --announce_rc \ --features=swift.use_global_module_cache \ --features=swift.split_derived_files_generation \ - --features=swift.skip_function_bodies_for_derived_files + --features=swift.skip_function_bodies_for_derived_files \ + --jobs=${CORE_COUNT} BAZEL_DEBUG_FLAGS=\ --features=swift.enable_batch_mode \ diff --git a/build-system/verify.sh b/build-system/verify.sh index 89e33bef02..14cd93a50c 100644 --- a/build-system/verify.sh +++ b/build-system/verify.sh @@ -10,7 +10,7 @@ export API_ID="8" export API_HASH="7245de8e747a0d6fbe11f7cc14fcc0bb" export BUNDLE_ID="ph.telegra.Telegraph" -export APP_CENTER_ID="" +export APP_CENTER_ID="0" export IS_INTERNAL_BUILD="false" export IS_APPSTORE_BUILD="true" export APPSTORE_ID="686449807" diff --git a/buildbox/verify-telegram.sh b/buildbox/verify-telegram.sh index 371382f6be..0765dde625 100644 --- a/buildbox/verify-telegram.sh +++ b/buildbox/verify-telegram.sh @@ -12,10 +12,10 @@ if [ -z "$CONFIGURATION" ] || [ -z "$MODE" ] ; then fi if [ "$MODE" == "cached" ]; then - BUCK_HTTP_CACHE="$BUCK_HTTP_CACHE" + BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" ERROR_OUTPUT_PATH="build/verifysanity_artifacts" elif [ "$MODE" == "full" ]; then - BUCK_HTTP_CACHE="" + BAZEL_HTTP_CACHE_URL="" ERROR_OUTPUT_PATH="build/verify_artifacts" else echo "Unknown mode $MODE" @@ -25,7 +25,9 @@ fi OUTPUT_PATH="build/artifacts" if [ "$CONFIGURATION" == "appstore" ]; then - IPA_PATH="$OUTPUT_PATH/Telegram.ipa" + if [ -z "$IPA_PATH" ]; then + IPA_PATH="$OUTPUT_PATH/Telegram.ipa" + fi else echo "Unknown configuration $CONFIGURATION" exit 1 @@ -38,9 +40,10 @@ fi VERIFY_PATH="TelegramVerifyBuild.ipa" -mv "$IPA_PATH" "$VERIFY_PATH" +rm -f "$VERIFY_PATH" +cp "$IPA_PATH" "$VERIFY_PATH" -BUCK_HTTP_CACHE="$BUCK_HTTP_CACHE" sh buildbox/build-telegram.sh verify +BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" sh buildbox/build-telegram.sh verify python3 tools/ipadiff.py "$IPA_PATH" "$VERIFY_PATH" retVal=$?