diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-10-09 16:41:27 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-10-09 16:44:24 +0200 |
| commit | 6bb0afe27f8283fda1a3716a778a25b26781b198 (patch) | |
| tree | 4247395245f899105bd256fbd90f49ace80ae275 | |
| parent | 14e135a5b5306fbdc7ac67125d6e0b10af7d5fbf (diff) | |
| download | mullvadvpn-6bb0afe27f8283fda1a3716a778a25b26781b198.tar.xz mullvadvpn-6bb0afe27f8283fda1a3716a778a25b26781b198.zip | |
Fix invalid usage of --locked
| -rwxr-xr-x | build-apk.sh | 10 | ||||
| -rwxr-xr-x | build.sh | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/build-apk.sh b/build-apk.sh index 165897e92a..47c42060f7 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -11,12 +11,12 @@ if [[ "${1:-""}" == "--dev-build" ]]; then BUILD_TYPE="debug" GRADLE_TASK="assembleDebug" APK_SUFFIX="-debug" - CARGO_FLAGS="" + CARGO_ARGS="" else BUILD_TYPE="release" GRADLE_TASK="assembleRelease" APK_SUFFIX="" - CARGO_FLAGS="--release" + CARGO_ARGS="--release" if [ ! -f "$SCRIPT_DIR/android/keystore.properties" ]; then echo "ERROR: No keystore.properties file found" >&2 @@ -29,6 +29,10 @@ if [[ "$BUILD_TYPE" == "debug" || "$(git describe)" != "$PRODUCT_VERSION" ]]; th GIT_COMMIT="$(git rev-parse HEAD | head -c 6)" PRODUCT_VERSION="${PRODUCT_VERSION}-dev-${GIT_COMMIT}" echo "Modifying product version to $PRODUCT_VERSION" +else + echo "Removing old Rust build artifacts" + cargo +stable clean + CARGO_ARGS+=" --locked" fi pushd "$SCRIPT_DIR/android" @@ -70,7 +74,7 @@ for ARCHITECTURE in $ARCHITECTURES; do echo "Building mullvad-daemon for $TARGET" source env.sh "$TARGET" - cargo +stable build --locked $CARGO_FLAGS --target "$TARGET" --package mullvad-jni + cargo +stable build $CARGO_ARGS --target "$TARGET" --package mullvad-jni cp -a "$SCRIPT_DIR/dist-assets/binaries/$TARGET" "$SCRIPT_DIR/android/build/extraJni/$ABI" cp "$SCRIPT_DIR/target/$TARGET/$BUILD_TYPE/libmullvad_jni.so" "$SCRIPT_DIR/android/build/extraJni/$ABI/" @@ -62,9 +62,11 @@ if [[ "$BUILD_MODE" == "dev" || $(git describe) != "$PRODUCT_VERSION" ]]; then echo "Disabling Apple notarization (macOs only) of installer in this dev build" NPM_PACK_ARGS+=" --no-apple-notarization" + CARGO_ARGS="" else echo "Removing old Rust build artifacts" cargo +stable clean + CARGO_ARGS="--locked" fi echo "Building Mullvad VPN $PRODUCT_VERSION" @@ -92,7 +94,7 @@ if [[ "$(uname -s)" == "MINGW"* ]]; then fi echo "Building Rust code in release mode using $RUSTC_VERSION..." -MULLVAD_ADD_MANIFEST="1" cargo +stable build --locked --release +MULLVAD_ADD_MANIFEST="1" cargo +stable build $CARGO_ARGS --release ################################################################################ # Other work to prepare the release. |