diff --git a/.github/actions/rust/action.yml b/.github/actions/rust/action.yml index 46ff026a5a..7640e986a7 100644 --- 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 cargo-quickinstall@0.3.5 + run: cargo install --locked cargo-quickinstall@0.3.5 - 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 index 34e45fbc94..3ff48a8d02 100644 --- 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.