Merge branch 'main' into clippy-bench

mozilla · Jan 20, 2025 · c977efb · c977efb
2 parents 3caba92 + df0a4dd
commit c977efb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/.github/actions/rust/action.yml b/.github/actions/rust/action.yml
@@ -24,9 +24,7 @@ runs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 # master
       with:
-        # Nightly pinned due to <https://github.com/mozilla/neqo/issues/2369>
-        # for now.
-        toolchain: ${{ inputs.version == 'nightly' && 'nightly-2025-01-15' || inputs.version }}
+        toolchain: ${{ inputs.version  }}
         components: ${{ inputs.components }}
         targets: ${{ inputs.targets }}
 

diff --git a/.github/workflows/sanitize.yml b/.github/workflows/sanitize.yml
@@ -27,8 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: Unpin ubuntu when https://github.com/rust-lang/rust/issues/111073#issuecomment-2561607617 is fixed.
-        os: [ubuntu-22.04, macos-latest] # No Windows support for sanitizers.
+        os: [ubuntu-latest, macos-latest] # No Windows support for sanitizers.
         sanitizer: [address, thread, leak] # TODO: memory
         exclude:
           # Memory and leak sanitizers are not supported on macOS.
@@ -62,7 +61,7 @@ jobs:
           ASAN_OPTIONS: detect_leaks=1:detect_stack_use_after_return=1
           RUST_BACKTRACE: 1
         run: |
-          if [ "${{ matrix.os }}" = "ubuntu-22.04" ]; then
+          if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
             sudo apt-get install -y --no-install-recommends llvm
             TARGET="x86_64-unknown-linux-gnu"
           elif [ "${{ matrix.os }}" = "macos-latest" ]; then

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ description = "Neqo, the Mozilla implementation of QUIC in Rust."
 keywords = ["quic", "http3", "neqo", "mozilla", "ietf", "firefox"]
 categories = ["network-programming", "web-programming"]
 readme = "README.md"
-version = "0.11.0"
+version = "0.12.0"
 # Keep in sync with `.rustfmt.toml` `edition`.
 edition = "2021"
 license = "MIT OR Apache-2.0"

diff --git a/qns/Dockerfile b/qns/Dockerfile
@@ -1,4 +1,4 @@
-FROM lukemathwalker/cargo-chef@sha256:d14930e5e1113a4c35d45def583d6f14aa62d941fc268145fe5d4f5c26d5704a AS chef
+FROM lukemathwalker/cargo-chef@sha256:9d68a1b38034d02bf694f819433a40f20ded326d2f20593724f166911db28ef8 AS chef
 
 WORKDIR /app