ci: Pin nightly (mozilla#2335)

* ci: Pin nightly Due to rust-lang/rust#135235 * Use default toolchain * Use default toolchain more
erichdongubler-mozilla · Jan 9, 2025 · db0a332 · db0a332
1 parent ef9e4dc
commit db0a332
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/actions/rust/action.yml b/.github/actions/rust/action.yml
@@ -24,7 +24,8 @@ runs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 # master
       with:
-        toolchain: ${{ inputs.version }}
+        # TODO: Unpin once https://github.com/rust-lang/rust/issues/135235 is fixed.
+        toolchain: ${{ inputs.version == 'nightly' && 'nightly-2025-01-07' || inputs.version }}
         components: ${{ inputs.components }}
         targets: ${{ inputs.targets }}
 
@@ -67,11 +68,11 @@ runs:
       env:
         GITHUB_TOKEN: ${{ inputs.token }}
       # TODO: Unpin cargo-quickinstall once our MSRV is > 1.76
-      run: cargo +${{ inputs.version }} install --locked [email protected]
+      run: cargo install --locked [email protected]
 
     - name: Install Rust tools
       shell: bash
       if: inputs.tools != ''
       env:
         GITHUB_TOKEN: ${{ inputs.token }}
-      run: cargo +${{ inputs.version }} quickinstall $(echo ${{ inputs.tools }} | tr -d ",")
+      run: cargo quickinstall $(echo ${{ inputs.tools }} | tr -d ",")
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Check
         run: |
           # shellcheck disable=SC2086
-          cargo +${{ matrix.rust-toolchain }} check $BUILD_TYPE --all-targets --features ci
+          cargo check $BUILD_TYPE --all-targets --features ci
 
       - name: Run tests and determine coverage
         env:
@@ -89,15 +89,15 @@ jobs:
           export DUMP_SIMULATION_SEEDS
           # shellcheck disable=SC2086
           if [ "${{ matrix.rust-toolchain }}" == "nightly" ]; then
-            cargo +${{ matrix.rust-toolchain }} llvm-cov nextest $BUILD_TYPE --mcdc --include-ffi --features ci --profile ci --codecov --output-path codecov.json
+            cargo llvm-cov nextest $BUILD_TYPE --mcdc --include-ffi --features ci --profile ci --codecov --output-path codecov.json
           else
-            cargo +${{ matrix.rust-toolchain }} nextest run $BUILD_TYPE --features ci --profile ci
+            cargo nextest run $BUILD_TYPE --features ci --profile ci
           fi
 
       - name: Run client/server transfer
         run: |
           # shellcheck disable=SC2086
-          cargo +${{ matrix.rust-toolchain }} build $BUILD_TYPE --bin neqo-client --bin neqo-server
+          cargo build $BUILD_TYPE --bin neqo-client --bin neqo-server
           "target/$BUILD_DIR/neqo-server" "$HOST:4433" &
           PID=$!
           # Give the server time to start.