File tree Expand file tree Collapse file tree 2 files changed +8
-7
lines changed
Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change 2424 - name : Install Rust
2525 uses : dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 # master
2626 with :
27- toolchain : ${{ inputs.version }}
27+ # TODO: Unpin once https://github.com/rust-lang/rust/issues/135235 is fixed.
28+ toolchain : ${{ inputs.version == 'nightly' && 'nightly-2025-01-07' || inputs.version }}
2829 components : ${{ inputs.components }}
2930 targets : ${{ inputs.targets }}
3031
@@ -67,11 +68,11 @@ runs:
6768 env :
6869 GITHUB_TOKEN : ${{ inputs.token }}
6970 # TODO: Unpin cargo-quickinstall once our MSRV is > 1.76
70- run :
cargo +${{ inputs.version }} install --locked [email protected] 71+ run :
cargo install --locked [email protected] 7172
7273 - name : Install Rust tools
7374 shell : bash
7475 if : inputs.tools != ''
7576 env :
7677 GITHUB_TOKEN : ${{ inputs.token }}
77- run : cargo +${{ inputs.version }} quickinstall $(echo ${{ inputs.tools }} | tr -d ",")
78+ run : cargo quickinstall $(echo ${{ inputs.tools }} | tr -d ",")
Original file line number Diff line number Diff line change 7979 - name : Check
8080 run : |
8181 # shellcheck disable=SC2086
82- cargo +${{ matrix.rust-toolchain }} check $BUILD_TYPE --all-targets --features ci
82+ cargo check $BUILD_TYPE --all-targets --features ci
8383
8484 - name : Run tests and determine coverage
8585 env :
@@ -89,15 +89,15 @@ jobs:
8989 export DUMP_SIMULATION_SEEDS
9090 # shellcheck disable=SC2086
9191 if [ "${{ matrix.rust-toolchain }}" == "nightly" ]; then
92- cargo +${{ matrix.rust-toolchain }} llvm-cov nextest $BUILD_TYPE --mcdc --include-ffi --features ci --profile ci --codecov --output-path codecov.json
92+ cargo llvm-cov nextest $BUILD_TYPE --mcdc --include-ffi --features ci --profile ci --codecov --output-path codecov.json
9393 else
94- cargo +${{ matrix.rust-toolchain }} nextest run $BUILD_TYPE --features ci --profile ci
94+ cargo nextest run $BUILD_TYPE --features ci --profile ci
9595 fi
9696
9797 - name : Run client/server transfer
9898 run : |
9999 # shellcheck disable=SC2086
100- cargo +${{ matrix.rust-toolchain }} build $BUILD_TYPE --bin neqo-client --bin neqo-server
100+ cargo build $BUILD_TYPE --bin neqo-client --bin neqo-server
101101 "target/$BUILD_DIR/neqo-server" "$HOST:4433" &
102102 PID=$!
103103 # Give the server time to start.
You can’t perform that action at this time.
0 commit comments