diff --git a/.circleci/config.yml b/.circleci/config.yml index 8bf80257fd3..409b87193b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 defaults: - rust_image: &rust_image quay.io/tarilabs/rust_tari-build-with-deps:nightly-2021-08-18 + rust_image: &rust_image quay.io/tarilabs/rust_tari-build-with-deps:nightly-2021-09-18 commands: test: @@ -76,13 +76,13 @@ commands: - run: name: Cargo fmt command: | - TOOLCHAIN=$(cat rust-toolchain) + TOOLCHAIN=$(awk '/channel = /{print $NF}' rust-toolchain.toml) rustup component add --toolchain $TOOLCHAIN rustfmt cargo fmt --all -- --check - run: name: Run clippy (main source) command: | - TOOLCHAIN=$(cat rust-toolchain) + TOOLCHAIN=$(awk '/channel = /{print $NF}' rust-toolchain.toml) rustup component add --toolchain $TOOLCHAIN clippy cargo clippy -- -D warnings -W clippy::cognitive_complexity - run: diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index ce18c6b5e0f..8323812244f 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -7,7 +7,7 @@ jobs: security_audit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: actions-rs/audit-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml index 98d73e620af..e1bc225ae92 100644 --- a/.github/workflows/base_node_binaries.yml +++ b/.github/workflows/base_node_binaries.yml @@ -61,7 +61,7 @@ jobs: - name: Setup Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2021-08-18 + toolchain: nightly-2021-09-18 components: rustfmt override: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d8576ad712..db9e8f7fe4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2021-08-18 + toolchain: nightly-2021-09-18 components: clippy, rustfmt override: true - name: cargo fmt @@ -86,7 +86,6 @@ jobs: - name: toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2021-08-18 components: clippy, rustfmt override: true @@ -135,7 +134,6 @@ jobs: - name: toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2021-08-18 components: clippy, rustfmt override: true diff --git a/.github/workflows/libwallet.yml b/.github/workflows/libwallet.yml index 8ba60fa1ffe..b2df3d71822 100644 --- a/.github/workflows/libwallet.yml +++ b/.github/workflows/libwallet.yml @@ -48,13 +48,13 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2021-08-18 + toolchain: nightly-2021-09-18 target: aarch64-apple-ios components: rustfmt override: true - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2021-08-18 + toolchain: nightly-2021-09-18 target: x86_64-apple-ios components: rustfmt override: true