Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Pin nightly #2335

Merged
merged 3 commits into from
Jan 9, 2025
Merged

ci: Pin nightly #2335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afde264
ci: Pin nightly
larseggert Jan 9, 2025
912f3d0
Use default toolchain
larseggert Jan 9, 2025
daf9d53
Use default toolchain more
larseggert Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/actions/rust/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 ",")
8 changes: 4 additions & 4 deletions .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down
Loading