diff options
| author | Albin <albin@mullvad.net> | 2022-10-20 09:03:35 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-10-20 09:03:35 +0200 |
| commit | 8e395f0235d994f77d2f0608e1376a6907acdee9 (patch) | |
| tree | 4ad1cd9e80b0a31994d1b9e5a5488320226aa8dc | |
| parent | 594e5c02d482b3abc6a75cc9e5127889016446e7 (diff) | |
| parent | a146a174dd1d33443dff7cb66f2712fd64a4b049 (diff) | |
| download | mullvadvpn-8e395f0235d994f77d2f0608e1376a6907acdee9.tar.xz mullvadvpn-8e395f0235d994f77d2f0608e1376a6907acdee9.zip | |
Merge branch 'improve-build-script-version-computation-feedback'
| -rwxr-xr-x | build-apk.sh | 7 | ||||
| -rwxr-xr-x | build.sh | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/build-apk.sh b/build-apk.sh index 9e906d97c0..027060dfb9 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -5,8 +5,12 @@ set -eu SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$SCRIPT_DIR" - +echo "Computing build version..." +echo "" PRODUCT_VERSION=$(cargo run -q --bin mullvad-version versionName) +echo "Building Mullvad VPN $PRODUCT_VERSION for Android" +echo "" + BUILD_TYPE="release" GRADLE_BUILD_TYPE="release" GRADLE_TASK="assembleRelease" @@ -56,7 +60,6 @@ if [[ "$BUILD_TYPE" == "release" && "$PRODUCT_VERSION" != *"-dev-"* ]]; then CARGO_ARGS+=" --locked" fi -echo "Building Mullvad VPN $PRODUCT_VERSION for Android" pushd "$SCRIPT_DIR/android" # Fallback to the system-wide gradle command if the gradlew script is removed. @@ -17,7 +17,9 @@ source scripts/utils/log RUSTC_VERSION=$(rustc --version) CARGO_TARGET_DIR=${CARGO_TARGET_DIR:-"target"} +echo "Computing build version..." PRODUCT_VERSION=$(cargo run -q --bin mullvad-version) +log_header "Building Mullvad VPN $PRODUCT_VERSION" # If compiler optimization and artifact compression should be turned on or not OPTIMIZE="false" @@ -151,8 +153,6 @@ fi # Compile and build ################################################################################ -log_header "Building Mullvad VPN $PRODUCT_VERSION" - # Sign all binaries passed as arguments to this function function sign_win { local NUM_RETRIES=3 |