From d4b540a20f583375f124bc1f94d16b2106b3bd0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= Date: Fri, 22 Dec 2023 09:14:12 -0500 Subject: [PATCH] ci: switch to dtolnay/rust-toolchain --- .github/workflows/bench-deploy.yml | 2 +- .github/workflows/bench-pr-comment.yml | 4 ++-- .github/workflows/ci.yml | 6 +++--- .github/workflows/gpu-bench-workflow-dispatch.yml | 2 +- .github/workflows/gpu-ci.yml | 4 ++-- .github/workflows/merge-tests.yml | 8 ++++---- .github/workflows/nightly.yml | 2 +- rust-toolchain | 1 - rust-toolchain.toml | 6 ++++++ 9 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/bench-deploy.yml b/.github/workflows/bench-deploy.yml index f02cf2c90a..78c41985ed 100644 --- a/.github/workflows/bench-deploy.yml +++ b/.github/workflows/bench-deploy.yml @@ -14,7 +14,7 @@ jobs: steps: # Install deps - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - uses: taiki-e/install-action@v2 with: diff --git a/.github/workflows/bench-pr-comment.yml b/.github/workflows/bench-pr-comment.yml index aea7178cb0..8769b08879 100644 --- a/.github/workflows/bench-pr-comment.yml +++ b/.github/workflows/bench-pr-comment.yml @@ -33,7 +33,7 @@ jobs: # Install dependencies - name: Install dependencies run: sudo apt-get install -y pkg-config libssl-dev - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - name: Load env vars run: | @@ -84,7 +84,7 @@ jobs: # This must also be compatible with the GPU architecture, see above link - run: nvcc --version # Install dependencies - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - name: Set output type run: echo "LURK_BENCH_OUTPUT=pr-comment" >> $GITHUB_ENV diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21ba0c1da6..2e11c9ec69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: submodules: recursive - name: Install dependencies run: sudo apt-get install -y pkg-config libssl-dev - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - uses: Swatinem/rust-cache@v2 - name: Linux Tests @@ -64,7 +64,7 @@ jobs: RUSTFLAGS: -D warnings steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - uses: Swatinem/rust-cache@v2 - run: rustup target add wasm32-unknown-unknown @@ -83,7 +83,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/gpu-bench-workflow-dispatch.yml b/.github/workflows/gpu-bench-workflow-dispatch.yml index 5d87e7ad7b..7f1a215760 100644 --- a/.github/workflows/gpu-bench-workflow-dispatch.yml +++ b/.github/workflows/gpu-bench-workflow-dispatch.yml @@ -21,7 +21,7 @@ jobs: - run: nvcc --version - uses: actions/checkout@v4 # Install dependencies - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - uses: taiki-e/install-action@v2 with: diff --git a/.github/workflows/gpu-ci.yml b/.github/workflows/gpu-ci.yml index d947b1ac8c..a601b65ad5 100644 --- a/.github/workflows/gpu-ci.yml +++ b/.github/workflows/gpu-ci.yml @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - uses: Swatinem/rust-cache@v2 # Check we have access to the machine's Nvidia drivers @@ -79,7 +79,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - uses: Swatinem/rust-cache@v2 # Check we have access to the machine's Nvidia drivers diff --git a/.github/workflows/merge-tests.yml b/.github/workflows/merge-tests.yml index 21c0624295..da95027427 100644 --- a/.github/workflows/merge-tests.yml +++ b/.github/workflows/merge-tests.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - uses: Swatinem/rust-cache@v2 - name: Linux Tests @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - uses: Swatinem/rust-cache@v2 - name: Linux Tests @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - uses: Swatinem/rust-cache@v2 - name: Linux Tests @@ -80,7 +80,7 @@ jobs: - run: nvcc --version - uses: actions/checkout@v4 # Install dependencies - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - uses: taiki-e/install-action@v2 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1e839483c3..7a0f7cfe7a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -37,7 +37,7 @@ jobs: submodules: recursive - name: Install dependencies run: sudo apt-get install -y pkg-config libssl-dev - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - uses: Swatinem/rust-cache@v2 - name: Linux Tests diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 5e3a425662..0000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.73.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..1ffa70ccd0 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,6 @@ +[toolchain] +# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. +profile = "default" +channel = "1.73" +targets = [ "wasm32-unknown-unknown" ] +