From d4978debe744a3099eb8f854e1cacc2c1ec4e21e Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Fri, 13 Sep 2024 15:53:18 +0200
Subject: [PATCH 1/3] test(transport): check local and remote GREASE_QUIC_BIT
 TP (#2101)

Co-authored-by: Lars Eggert <lars@eggert.org>
---
 .../src/connection/tests/handshake.rs         | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/neqo-transport/src/connection/tests/handshake.rs b/neqo-transport/src/connection/tests/handshake.rs
index fb2820aebc..b70b024c79 100644
--- a/neqo-transport/src/connection/tests/handshake.rs
+++ b/neqo-transport/src/connection/tests/handshake.rs
@@ -36,7 +36,7 @@ use crate::{
     events::ConnectionEvent,
     server::ValidateAddress,
     stats::FrameStats,
-    tparams::{TransportParameter, MIN_ACK_DELAY},
+    tparams::{self, TransportParameter, MIN_ACK_DELAY},
     tracking::DEFAULT_ACK_DELAY,
     CloseReason, ConnectionParameters, EmptyConnectionIdGenerator, Error, Pmtud, StreamType,
     Version,
@@ -1252,3 +1252,27 @@ fn server_initial_retransmits_identical() {
         total_ptos += pto;
     }
 }
+
+#[test]
+fn grease_quic_bit_transport_parameter() {
+    fn get_remote_tp(conn: &Connection) -> bool {
+        conn.tps
+            .borrow()
+            .remote
+            .as_ref()
+            .unwrap()
+            .get_empty(tparams::GREASE_QUIC_BIT)
+    }
+
+    for client_grease in [true, false] {
+        for server_grease in [true, false] {
+            let mut client = new_client(ConnectionParameters::default().grease(client_grease));
+            let mut server = new_server(ConnectionParameters::default().grease(server_grease));
+
+            connect(&mut client, &mut server);
+
+            assert_eq!(client_grease, get_remote_tp(&server));
+            assert_eq!(server_grease, get_remote_tp(&client));
+        }
+    }
+}

From ee8a69634427681e6c2659039a2e46de969e9ef1 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Sun, 15 Sep 2024 22:23:56 -0700
Subject: [PATCH 2/3] ci: Unpin nss (#2108)

* ci: Unpin nss

Verbose, single-threaded build

* Fix

* Finalize
---
 .github/actions/nss/action.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/actions/nss/action.yml b/.github/actions/nss/action.yml
index 94361f4a89..f698ac8932 100644
--- a/.github/actions/nss/action.yml
+++ b/.github/actions/nss/action.yml
@@ -64,7 +64,6 @@ runs:
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       with:
         repository: nss-dev/nss
-        ref: c631e9cb5ed1806038f7b85fbbc825f856c9d133 # later revisions hang when building on Windows
         path: nss
 
     - name: Checkout NSPR

From 5410bd03e27a8e2954e7fe1333eeba06cd856c79 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Sun, 15 Sep 2024 22:24:49 -0700
Subject: [PATCH 3/3] ci: Fix Firefox build on Windows (#2109)

* ci: Fix Firefox build on Windows

* Exit

* Check

* WindowsSdkDir

* Finalize

* Also only PR-comment if we tried to build
---
 .github/workflows/firefox.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/firefox.yml b/.github/workflows/firefox.yml
index 58ec5a9383..54e2e4b712 100644
--- a/.github/workflows/firefox.yml
+++ b/.github/workflows/firefox.yml
@@ -116,8 +116,10 @@ jobs:
           EXT: ${{ runner.os == 'macOS' && '.app' || '' }}
         run: |
           cd mozilla-unified
+          # Work around "ERROR: WINDOWSSDKDIR cannot be set when using the bootstrapped WINSYSROOT"
+          # (Capitalization "WindowsSdkDir" matters)
+          [ "${{ runner.os }}" == "Windows" ] && unset WindowsSdkDir
           ./mach build && tar -cf "../$FIREFOX.tar" -C "../$FIREFOX/dist" "$NAME$TYPE$EXT"
-          exit 0
 
       - name: Export binary
         id: upload
@@ -138,7 +140,7 @@ jobs:
 
   comment:
     name: Comment on PR
-    if: always()
+    if: github.event.pull_request.draft == false
     needs: firefox
     runs-on: ubuntu-latest
     steps: