From 6156da33fd2fcebec2759e0edc51cadacecbb581 Mon Sep 17 00:00:00 2001
From: Samuel Colvin <s@muelcolvin.com>
Date: Mon, 4 Jul 2022 06:09:33 +0100
Subject: [PATCH 1/2] Pin rust nightly

---
 .github/workflows/benchmarks.yml | 2 --
 .github/workflows/ci.yml         | 6 ++----
 rust-toolchain                   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index cb0bea761..6c8ba0cfc 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -43,8 +43,6 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
-          override: true
 
       - name: cache rust
         uses: Swatinem/rust-cache@v1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0dda0ef3f..3e2ffb191 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         rust-toolchain:
-          - nightly
+          - nightly-2022-07-01
         python-version:
           - '3.7'
           - '3.8'
@@ -86,7 +86,7 @@ jobs:
     - run: ./tests/rust_coverage_export.sh
 
     - uses: codecov/codecov-action@v2
-      if: matrix.rust-toolchain == 'nightly'
+      if: matrix.rust-toolchain == 'nightly-2022-07-01'
       with:
         env_vars: PYTHON
 
@@ -179,10 +179,8 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
           components: rust-src
           target: wasm32-unknown-emscripten
-          override: true
 
       - name: cache rust
         uses: Swatinem/rust-cache@v1
diff --git a/rust-toolchain b/rust-toolchain
index bf867e0ae..77f825e51 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly
+nightly-2022-07-01

From 6758521ab33049b621fa8a841fe2c916c9ad5f7d Mon Sep 17 00:00:00 2001
From: Samuel Colvin <s@muelcolvin.com>
Date: Mon, 4 Jul 2022 06:16:19 +0100
Subject: [PATCH 2/2] simplify ci setup a little

---
 .github/workflows/ci.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e2ffb191..24bdb9732 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         rust-toolchain:
-          - nightly-2022-07-01
+          - nightly
         python-version:
           - '3.7'
           - '3.8'
@@ -34,8 +34,16 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: install rust
-      uses: actions-rs/toolchain@v1.0.6
+    - name: install rust nightly
+      if: matrix.rust-toolchain == 'nightly'
+      uses: actions-rs/toolchain@v1
+      with:
+        # use the default version from rust-toolchain in case rust in pinned there
+        profile: minimal
+
+    - name: install rust stable
+      if: matrix.rust-toolchain != 'nightly'
+      uses: actions-rs/toolchain@v1
       with:
         profile: minimal
         toolchain: ${{ matrix.rust-toolchain }}
@@ -97,7 +105,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: install rust
-      uses: actions-rs/toolchain@v1.0.6
+      uses: actions-rs/toolchain@v1
       with:
         profile: minimal
         override: true
@@ -140,7 +148,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: install rust
-      uses: actions-rs/toolchain@v1.0.6
+      uses: actions-rs/toolchain@v1
       with:
         profile: minimal