diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-10-09 15:36:05 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-10-09 15:49:13 +0200 |
| commit | 6a802299170b118df77fecb3b419c3f0023d90f5 (patch) | |
| tree | c7c7725eb8946f9e7206a4bc7fdab59831cbf7a5 | |
| parent | 833b6295ef8702bf9a785b0860af4711c1f3484e (diff) | |
| download | mullvadvpn-6a802299170b118df77fecb3b419c3f0023d90f5.tar.xz mullvadvpn-6a802299170b118df77fecb3b419c3f0023d90f5.zip | |
Add --locked to all cargo build invocations
| -rwxr-xr-x | build-apk.sh | 2 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | ci/ci-rust-script.sh | 4 | ||||
| -rwxr-xr-x | prepare_release.sh | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/build-apk.sh b/build-apk.sh index 2459fe9935..165897e92a 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -70,7 +70,7 @@ for ARCHITECTURE in $ARCHITECTURES; do echo "Building mullvad-daemon for $TARGET" source env.sh "$TARGET" - cargo build $CARGO_FLAGS --target "$TARGET" --package mullvad-jni + cargo +stable build --locked $CARGO_FLAGS --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/" @@ -92,7 +92,7 @@ if [[ "$(uname -s)" == "MINGW"* ]]; then fi echo "Building Rust code in release mode using $RUSTC_VERSION..." -MULLVAD_ADD_MANIFEST="1" cargo +stable build --release +MULLVAD_ADD_MANIFEST="1" cargo +stable build --locked --release ################################################################################ # Other work to prepare the release. diff --git a/ci/ci-rust-script.sh b/ci/ci-rust-script.sh index 90042307ce..797a9e1008 100755 --- a/ci/ci-rust-script.sh +++ b/ci/ci-rust-script.sh @@ -19,8 +19,8 @@ esac # FIXME: Becaues of our old jsonrpc dependency our Rust code won't build # on latest nightly. if [ "${RUST_TOOLCHAIN_CHANNEL}" != "nightly" ]; then - cargo build --verbose - cargo test --verbose + cargo build --locked --verbose + cargo test --locked --verbose fi if [ "${RUST_TOOLCHAIN_CHANNEL}" = "nightly" ]; then diff --git a/prepare_release.sh b/prepare_release.sh index f30e2e2749..0fdd7b5f4d 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -28,7 +28,7 @@ echo "Updating version in metadata files..." echo "Syncing Cargo.lock with new version numbers" source env.sh "" -cargo +stable build +cargo +stable --locked build echo "Commiting metadata changes to git..." git commit -S -m "Updating version in package files" \ |