Merge branch 'main' into ci-neqo-glue

Signed-off-by: Lars Eggert <lars@eggert.org>
mozilla · Oct 9, 2024 · 9c4ae7d · 9c4ae7d
2 parents d23d18c + f39e12e
commit 9c4ae7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/firefox.yml b/.github/workflows/firefox.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Install deps (Windows)
         if: runner.os == 'Windows' && (matrix.flavor != 'browser' || github.event.pull_request.draft == true)
-        run: choco install -y mozillabuild
+        run: choco install -y mozillabuild --version 4.0.2
 
       - name: Install Rust
         if: matrix.flavor != 'browser' || github.event.pull_request.draft == true

diff --git a/qns/Dockerfile b/qns/Dockerfile
@@ -1,8 +1,7 @@
-FROM lukemathwalker/cargo-chef:latest-rust-latest AS chef
+FROM lukemathwalker/cargo-chef@sha256:f50231b8a01af14eda124040535193d60d9c86d413b02553d2809e5d881b9a90 AS chef
 
 WORKDIR /app
 
-
 FROM chef AS planner
 
 COPY . .
@@ -38,7 +37,6 @@ RUN set -eux; \
 
 # Copy only binaries to the final image to keep it small.
 
-
 FROM martenseemann/quic-network-simulator-endpoint@sha256:42d79cc04b88f2e4b4c8beb418b0843c123f26852ff6bbba4caa6badc0043d23
 
 ENV LD_LIBRARY_PATH=/neqo/lib