From f0466aaa567d5c792b2ac379870597eec38ebee9 Mon Sep 17 00:00:00 2001 From: Stephen Chavez Date: Wed, 7 Sep 2022 15:25:14 +0000 Subject: [PATCH] pinning cargo dep versions for CLI (#1775) * pinning cargo dep versions for CLI * add --locked to the workflow Co-authored-by: Stephen Chavez --- .github/workflows/backend.yaml | 4 ++-- backend/build-dev.sh | 2 +- backend/build-portable-dev.sh | 2 +- backend/build-portable.sh | 2 +- backend/build-prod.sh | 4 ++-- backend/install-sdk.sh | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/backend.yaml b/.github/workflows/backend.yaml index 2d9e607b2..f7c3e3ffe 100644 --- a/.github/workflows/backend.yaml +++ b/.github/workflows/backend.yaml @@ -115,7 +115,7 @@ jobs: run: ./check-environment.sh - name: Build backend - run: cargo build --release --target x86_64-unknown-linux-gnu + run: cargo build --release --target x86_64-unknown-linux-gnu --locked working-directory: backend if: ${{ matrix.target == 'x86_64' }} @@ -129,7 +129,7 @@ jobs: rustup install ${{ env.RUST_VERSION }} && rustup override set ${{ env.RUST_VERSION }} && rustup target add aarch64-unknown-linux-gnu && - cargo build --release --target ${{ matrix.target }}-unknown-linux-gnu' + cargo build --release --target ${{ matrix.target }}-unknown-linux-gnu --locked' if: ${{ matrix.target == 'aarch64' }} - name: 'Tar files to preserve file permissions' diff --git a/backend/build-dev.sh b/backend/build-dev.sh index 479244184..80bfb44c0 100755 --- a/backend/build-dev.sh +++ b/backend/build-dev.sh @@ -16,7 +16,7 @@ fi alias 'rust-arm64-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64' cd .. -rust-arm64-builder sh -c "(cd backend && cargo build)" +rust-arm64-builder sh -c "(cd backend && cargo build --locked)" cd backend sudo chown -R $USER target diff --git a/backend/build-portable-dev.sh b/backend/build-portable-dev.sh index f2c792af9..cdeb2b6d3 100755 --- a/backend/build-portable-dev.sh +++ b/backend/build-portable-dev.sh @@ -16,7 +16,7 @@ fi alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' cd .. -rust-musl-builder sh -c "(cd backend && cargo +beta build --target=x86_64-unknown-linux-musl --no-default-features)" +rust-musl-builder sh -c "(cd backend && cargo +beta build --target=x86_64-unknown-linux-musl --no-default-features --locked)" cd backend sudo chown -R $USER target diff --git a/backend/build-portable.sh b/backend/build-portable.sh index 4c04520bf..9b1b96f34 100755 --- a/backend/build-portable.sh +++ b/backend/build-portable.sh @@ -16,7 +16,7 @@ fi alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' cd .. -rust-musl-builder sh -c "(cd backend && cargo +beta build --release --target=x86_64-unknown-linux-musl --no-default-features)" +rust-musl-builder sh -c "(cd backend && cargo +beta build --release --target=x86_64-unknown-linux-musl --no-default-features --locked)" cd backend sudo chown -R $USER target diff --git a/backend/build-prod.sh b/backend/build-prod.sh index 7fe706ee2..3ac0b0453 100755 --- a/backend/build-prod.sh +++ b/backend/build-prod.sh @@ -24,10 +24,10 @@ if [[ "$ENVIRONMENT" =~ (^|-)dev($|-) ]]; then FLAGS="dev,$FLAGS" fi if [[ "$FLAGS" = "" ]]; then - rust-arm64-builder sh -c "(git config --global --add safe.directory '*'; cd backend && cargo build --release)" + rust-arm64-builder sh -c "(git config --global --add safe.directory '*'; cd backend && cargo build --release --locked)" else echo "FLAGS=$FLAGS" - rust-arm64-builder sh -c "(git config --global --add safe.directory '*'; cd backend && cargo build --release --features $FLAGS)" + rust-arm64-builder sh -c "(git config --global --add safe.directory '*'; cd backend && cargo build --release --features $FLAGS --locked)" fi cd backend diff --git a/backend/install-sdk.sh b/backend/install-sdk.sh index 90425d9dd..5ebd74c8d 100755 --- a/backend/install-sdk.sh +++ b/backend/install-sdk.sh @@ -8,4 +8,4 @@ if [ "$0" != "./install-sdk.sh" ]; then exit 1 fi -cargo install --bin=embassy-sdk --bin=embassy-cli --path=. --no-default-features --features=js_engine +cargo install --bin=embassy-sdk --bin=embassy-cli --path=. --no-default-features --features=js_engine --locked