From c6c61919214bb1054b95ff91b1059abcbd1635c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= <4142+huitseeker@users.noreply.github.com> Date: Fri, 22 Dec 2023 09:49:45 -0500 Subject: [PATCH] ci: switch to dtolnay/rust-toolchain (#256) --- .github/workflows/release-pr.yml | 2 +- .github/workflows/rust.yml | 8 ++++---- rust-toolchain | 1 - rust-toolchain.toml | 4 ++++ 4 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index 7b62a75c..6224c183 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -18,7 +18,7 @@ jobs: package: [neptune] steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: profile: minimal - name: Get current version diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ffef55fe..a118ba8d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -44,7 +44,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 # make sure benches don't bit-rot @@ -65,7 +65,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 @@ -102,7 +102,7 @@ jobs: EC_GPU_FRAMEWORK: cuda 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 # Check we have access to the machine's Nvidia drivers @@ -132,7 +132,7 @@ jobs: EC_GPU_FRAMEWORK: opencl 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 - name: Install GPU deps diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 5e3a4256..00000000 --- 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 00000000..de718234 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. +profile = "default" +channel = "1.73"