Skip to content

Commit

Permalink
[ci]: Bump rust, mold and nightly to 1.60, 1.2.0 and 1.62 respectivel…
Browse files Browse the repository at this point in the history
  • Loading branch information
appetrosyan authored and mversic committed May 12, 2022
1 parent 3b0487e commit b7600af
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev-pr-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev-pr-wasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/iroha2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.59"
channel = "1.60"
components = [ "rustc", "clippy", "rustfmt" ]
targets = ["wasm32-unknown-unknown"]
profile = "minimal"

0 comments on commit b7600af

Please sign in to comment.