From b7600af5eb963df603dfc5668a8383a84f80745b Mon Sep 17 00:00:00 2001 From: Aleksandr Petrosyan Date: Wed, 20 Apr 2022 16:39:31 +0000 Subject: [PATCH] [ci]: Bump rust, mold and nightly to 1.60, 1.2.0 and 1.62 respectively. (#2129) --- .github/workflows/iroha2-dev-pr-static.yml | 2 +- .github/workflows/iroha2-dev-pr-wasm.yaml | 2 +- .github/workflows/iroha2.yml | 10 +++++----- Dockerfile.ci | 6 +++--- rust-toolchain.toml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/iroha2-dev-pr-static.yml b/.github/workflows/iroha2-dev-pr-static.yml index 23e9c290068..ac5e48d78a7 100644 --- a/.github/workflows/iroha2-dev-pr-static.yml +++ b/.github/workflows/iroha2-dev-pr-static.yml @@ -22,7 +22,7 @@ jobs: - uses: Swatinem/rust-cache@v1 - name: Format check - run: cargo +nightly-2021-12-02 fmt --all -- --check + run: cargo +nightly-2022-04-20 fmt --all -- --check - name: Static analysis without features run: cargo lints clippy --workspace --benches --tests --examples --quiet --no-default-features if: always() diff --git a/.github/workflows/iroha2-dev-pr-wasm.yaml b/.github/workflows/iroha2-dev-pr-wasm.yaml index e8947ff0f85..fe4f65ea579 100644 --- a/.github/workflows/iroha2-dev-pr-wasm.yaml +++ b/.github/workflows/iroha2-dev-pr-wasm.yaml @@ -27,7 +27,7 @@ jobs: # Static analysis - name: Format check - run: cargo +nightly-2021-12-02 fmt --all -- --check + run: cargo +nightly-2022-04-20 fmt --all -- --check - name: Static analysis without features run: cargo lints clippy --benches --tests --examples --quiet --no-default-features if: always() diff --git a/.github/workflows/iroha2.yml b/.github/workflows/iroha2.yml index b6d9af17ed5..7b8ef3f70e5 100644 --- a/.github/workflows/iroha2.yml +++ b/.github/workflows/iroha2.yml @@ -50,7 +50,7 @@ jobs: with: context: . push: true - tags: hyperledger/iroha2:2.0.0-pre-rc.2 + tags: hyperledger/iroha2:stable build-args: | TARGET_DIR=release PROFILE=--release @@ -59,7 +59,7 @@ jobs: with: context: . push: true - tags: hyperledger/iroha2:client-cli + tags: hyperledger/iroha2:stable-client-cli build-args: | TARGET_DIR=release PROFILE=--release @@ -69,14 +69,14 @@ jobs: with: context: . push: true - tags: hyperledger/iroha2:crypto-cli + tags: hyperledger/iroha2:stable-crypto-cli build-args: | TARGET_DIR=release PROFILE=--release BIN=iroha_crypto_cli - name: Build and push load-rs:release docker image - run: | + run: | sleep 10s echo "wait to finish other workflow" - uses: convictional/trigger-workflow-and-wait@v1.6.0 @@ -85,4 +85,4 @@ jobs: repo: iroha2-longevity-load-rs github_token: ${{ secrets.G_ACCESS_TOKEN }} workflow_file_name: load-rs-push-from-release.yaml - ref: release + ref: release diff --git a/Dockerfile.ci b/Dockerfile.ci index 441e2428661..e35c8efcfe1 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND=noninteractive \ RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.59.0 + RUST_VERSION=1.60.0 RUN set -eux; \ apt-get update; \ @@ -43,14 +43,14 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* RUN git clone https://github.com/rui314/mold.git; \ - git -C "./mold" checkout v1.1.1; \ + git -C "./mold" checkout v1.2.0; \ make --directory="./mold" CXX=clang++; \ make --directory="./mold" install; \ rm -rf "./mold" RUN rustup component add llvm-tools-preview clippy; \ rustup target add wasm32-unknown-unknown; \ - rustup install --profile default nightly-2021-12-02; \ + rustup install --profile default nightly-2022-04-20; \ cargo install cargo-lints cargo-nono webassembly-test-runner grcov RUN curl -fsSL https://get.docker.com -o get-docker.sh; \ diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 49a73e1b9ac..a4ed7c20ed3 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.59" +channel = "1.60" components = [ "rustc", "clippy", "rustfmt" ] targets = ["wasm32-unknown-unknown"] profile = "minimal"