ci: switch to dtolnay/rust-toolchain (#1000)

argumentcomputer · Dec 22, 2023 · 483a7b8 · 483a7b8 · github-actions · Dec 22, 2023
1 parent 0a4960a
commit 483a7b8
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/rust-toolchain.toml 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" ]
+
	`fib-ref=0a4960a846be8d5a6fbaa762eb5353a13fae1374`	`fib-ref=483a7b8876ee3b05e5cd459e19ea2cbfa6c0a3bb`
`num-100`	`2.36 s` (✅ 1.00x)	`2.37 s` (✅ 1.00x slower)
`num-200`	`4.63 s` (✅ 1.00x)	`4.64 s` (✅ 1.00x slower)
	`fib-ref=0a4960a846be8d5a6fbaa762eb5353a13fae1374`	`fib-ref=483a7b8876ee3b05e5cd459e19ea2cbfa6c0a3bb`
`num-100`	`1.99 s` (✅ 1.00x)	`1.98 s` (✅ 1.00x faster)
`num-200`	`4.50 s` (✅ 1.00x)	`4.49 s` (✅ 1.00x faster)
	`fib-ref=483a7b8876ee3b05e5cd459e19ea2cbfa6c0a3bb`
`num-100`	`1.98 s` (✅ 1.00x)
`num-200`	`4.48 s` (✅ 1.00x)