From 1fb7dd7af2d5cf26d9e28f8a222c86cda0a85a82 Mon Sep 17 00:00:00 2001 From: OlivierHecart Date: Wed, 18 Oct 2023 11:27:52 +0200 Subject: [PATCH] Change rust-toolchain to rust-toolchain.toml file --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 15 ++++++--------- rust-toolchain | 1 - rust-toolchain.toml | 2 ++ 4 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfafd67..cf39d92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,9 +36,9 @@ jobs: submodules: recursive - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - components: rustfmt, clippy + run: | + rustup show + rustup component add rustfmt clippy - name: Code format check uses: actions-rs/cargo@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db8bbf5..c25fab4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,9 +29,9 @@ jobs: with: submodules: recursive - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - components: rustfmt, clippy + run: | + rustup show + rustup component add rustfmt clippy - name: Code format check uses: actions-rs/cargo@v1 with: @@ -166,12 +166,9 @@ jobs: esac - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.job.target }} - override: true - profile: minimal + run: | + rustup show + rustup target add ${{ matrix.job.target }} - name: zenoh-plugin-ros1 > Build uses: actions-rs/cargo@v1 diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 0834888..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.72.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..743f7cd --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.72.0"