From 46e15cbbb7b51432ecc5363abdc03fc908377a5e Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Fri, 13 Sep 2024 03:03:20 -0700
Subject: [PATCH] ci: Pin nightly to `nightly-2024-09-01` (#2105)

Until https://github.com/rust-lang/rustup/issues/4019 is fixed.
---
 .github/workflows/bench.yml | 2 +-
 .github/workflows/check.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index d758aff65b..44d2860da0 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -10,7 +10,7 @@ env:
   CARGO_PROFILE_RELEASE_DEBUG: true
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: 1
-  TOOLCHAIN: nightly
+  TOOLCHAIN: nightly-2024-09-01
   RUSTFLAGS: -C link-arg=-fuse-ld=lld -C link-arg=-Wl,--no-rosegment, -C force-frame-pointers=yes
   PERF_OPT: record -F997 --call-graph fp -g
 
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 2d3f7ba5bb..cdf3ed0d58 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -28,7 +28,7 @@ jobs:
         # Don't increase beyond what Firefox is currently using:
         # https://searchfox.org/mozilla-central/search?q=MINIMUM_RUST_VERSION&path=python/mozboot/mozboot/util.py
         # Keep in sync with Cargo.toml
-        rust-toolchain: [1.76.0, stable, nightly]
+        rust-toolchain: [1.76.0, stable, nightly-2024-09-01]
         type: [debug]
         include:
           - os: ubuntu-latest
@@ -92,7 +92,7 @@ jobs:
 
       - name: Check formatting
         run: |
-          if [ "${{ matrix.rust-toolchain }}" != "nightly" ]; then
+          if [ "${{ startsWith(matrix.rust-toolchain, 'nightly') && 'nightly' }}" != "nightly" ]; then
             CONFIG_PATH="--config-path=$(mktemp)"
           fi
           # shellcheck disable=SC2086
@@ -112,7 +112,7 @@ jobs:
           # workspace. See e.g. https://github.com/mozilla/neqo/pull/1695.
           cargo +${{ matrix.rust-toolchain }} hack clippy --all-targets --feature-powerset --exclude-features gecko -- -D warnings || ${{ matrix.rust-toolchain == 'nightly' }}
           # Check that the fuzz targets also build
-          if [ ${{ matrix.rust-toolchain }} == 'nightly' ]; then
+          if [ ${{ startsWith(matrix.rust-toolchain, 'nightly') && 'nightly' }} == 'nightly' ]; then
             cargo +${{ matrix.rust-toolchain }} fuzz check
           fi
         if: success() || failure()