Merge branch 'main' into fix-1963

Signed-off-by: Lars Eggert <lars@eggert.org>
mozilla · Jan 10, 2025 · 9d6449e · 9d6449e
2 parents 24d13cc + e5770ce
commit 9d6449e
Show file tree

Hide file tree

Showing 121 changed files with 809 additions and 1,305 deletions.
diff --git a/.github/actions/pr-comment-data-export/action.yml b/.github/actions/pr-comment-data-export/action.yml
@@ -31,7 +31,7 @@ runs:
           echo "${{ inputs.log-url }}" > comment-data/log-url
         fi
     - if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: ${{ inputs.name }}
         path: comment-data

diff --git a/.github/actions/quic-interop-runner/action.yml b/.github/actions/quic-interop-runner/action.yml
@@ -94,7 +94,7 @@ runs:
         exit $FAILED
       shell: bash
 
-    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+    - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: always()
       id: upload-logs
       with:
@@ -110,7 +110,7 @@ runs:
           mv result.json.tmp result.json
       shell: bash
 
-    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+    - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: always()
       with:
         name: '${{ inputs.client }} vs. ${{ inputs.server }} results'

diff --git 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/bench.yml b/.github/workflows/bench.yml
@@ -276,7 +276,7 @@ jobs:
 
       - name: Export perf data
         id: export
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: ${{ github.event.repository.name }}-${{ github.sha }}
           path: |

diff --git 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.
@@ -123,7 +123,7 @@ jobs:
 
       - name: Save simulation seeds artifact
         if: always()
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: simulation-seeds-${{ matrix.os }}-${{ matrix.rust-toolchain }}-${{ matrix.type }}
           path: simulation-seeds

diff --git a/.github/workflows/firefox.yml b/.github/workflows/firefox.yml
@@ -141,7 +141,7 @@ jobs:
 
       - name: Export binary
         id: upload
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: ${{ runner.os }}-${{ env.FIREFOX }}-${{ matrix.type }}.tgz
           path: ${{ env.FIREFOX }}.tar
@@ -150,7 +150,7 @@ jobs:
       - run: echo "${{ steps.upload.outputs.artifact-url }}" >> artifact
 
       - name: Export artifact URL
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: artifact-${{ runner.os }}-${{ env.FIREFOX }}-${{ matrix.type }}
           path: artifact

diff --git a/.github/workflows/mutants.yml b/.github/workflows/mutants.yml
@@ -61,7 +61,7 @@ jobs:
             echo '```'
           } > "$GITHUB_STEP_SUMMARY"
 
-      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: mutants.out
           path: mutants.out
diff --git a/.github/workflows/qns.yml b/.github/workflows/qns.yml
@@ -77,7 +77,7 @@ jobs:
           platforms: 'linux/amd64'
           outputs: type=docker,dest=/tmp/${{ env.LATEST }}.tar
 
-      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: '${{ env.LATEST }} Docker image'
           path: /tmp/${{ env.LATEST }}.tar

diff --git a/.github/workflows/sanitize.yml b/.github/workflows/sanitize.yml
@@ -81,7 +81,7 @@ jobs:
 
       - name: Save simulation seeds artifact
         if: env.DUMP_SIMULATION_SEEDS
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: simulation-seeds-${{ matrix.os }}-sanitizer-${{ matrix.sanitizer }}
           path: ${{ env.DUMP_SIMULATION_SEEDS }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml