Merge branch 'main' into fix-1963

mozilla · Jan 7, 2025 · c956338 · c956338
2 parents 8853788 + 17129d4
commit c956338
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -111,7 +111,7 @@ jobs:
           RUST_LOG: warn
           BUILD_DIR: ${{ matrix.type == 'release' && 'release' || 'debug' }}
 
-      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
+      - uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
         with:
           files: codecov.json
           fail_ci_if_error: false

diff --git a/.github/workflows/qns.yml b/.github/workflows/qns.yml
@@ -35,7 +35,7 @@ jobs:
       packages: write
     steps:
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
-      - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
+      - uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
       - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ghcr.io

diff --git a/.github/workflows/sanitize.yml b/.github/workflows/sanitize.yml
@@ -72,6 +72,7 @@ jobs:
             {
               echo "leak:dyld4::RuntimeState"
               echo "leak:fetchInitializingClassList"
+              echo "leak:std::rt::lang_start_internal"
             } > suppressions.txt
             PWD=$(pwd)
             export LSAN_OPTIONS="suppressions=$PWD/suppressions.txt"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/neqo-transport/src/recv_stream.rs b/neqo-transport/src/recv_stream.rs
@@ -736,7 +736,6 @@ impl RecvStream {
         Ok(())
     }
 
-    /// If we should tell the sender they have more credit, return an offset
     fn flow_control_retire_data(
         new_read: u64,
         fc: &mut ReceiverFlowControl<StreamId>,

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