From cd2ceeb271965dbab42c22744fb1bdd60bb19ffd Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Mon, 5 Feb 2024 10:12:18 +0200
Subject: [PATCH 1/3] ci: Build docker image for multiple architectures

---
 .github/workflows/qns.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/qns.yml b/.github/workflows/qns.yml
index 353d0ae696..ea9c7fb041 100644
--- a/.github/workflows/qns.yml
+++ b/.github/workflows/qns.yml
@@ -5,7 +5,7 @@ on:
     - cron: '42 3 * * 2,5' # Runs at 03:42 UTC (m and h chosen arbitrarily) twice a week.
   workflow_dispatch:
   pull_request:
-    branch: ["main"]
+    branches: ["main"]
     paths:
       - 'qns/**'
       - '.github/workflows/qns.yml'
@@ -13,6 +13,9 @@ jobs:
   docker-image:
     runs-on: ubuntu-latest
     steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -47,3 +50,4 @@ jobs:
             RUST_VERSION=stable
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          platforms: linux/amd64, linux/arm64

From c8a1fd49ffd124abed00537562c329af8e55c932 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Mon, 5 Feb 2024 10:37:26 +0200
Subject: [PATCH 2/3] Print executable name and version

---
 neqo-client/src/main.rs | 2 ++
 neqo-server/src/main.rs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/neqo-client/src/main.rs b/neqo-client/src/main.rs
index 3db90aac10..69b399e859 100644
--- a/neqo-client/src/main.rs
+++ b/neqo-client/src/main.rs
@@ -1020,6 +1020,8 @@ fn main() -> Res<()> {
         }
     }
 
+    println!("{} {}", env!("CARGO_BIN_NAME"), env!("CARGO_PKG_VERSION"));
+
     let urls_by_origin = args
         .urls
         .clone()
diff --git a/neqo-server/src/main.rs b/neqo-server/src/main.rs
index 9b924504cc..50f3292c4e 100644
--- a/neqo-server/src/main.rs
+++ b/neqo-server/src/main.rs
@@ -829,6 +829,8 @@ async fn main() -> Result<(), io::Error> {
         }
     }
 
+    println!("{} {}", env!("CARGO_BIN_NAME"), env!("CARGO_PKG_VERSION"));
+
     let mut servers_runner = ServersRunner::new(args)?;
     servers_runner.run().await
 }

From 1b4c8a4971f90313ce987ef65493cf3125036a3f Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Mon, 5 Feb 2024 11:36:17 +0200
Subject: [PATCH 3/3] Better way to print versions during qns run

---
 neqo-client/src/main.rs | 2 --
 neqo-server/src/main.rs | 2 --
 qns/interop.sh          | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/neqo-client/src/main.rs b/neqo-client/src/main.rs
index 69b399e859..3db90aac10 100644
--- a/neqo-client/src/main.rs
+++ b/neqo-client/src/main.rs
@@ -1020,8 +1020,6 @@ fn main() -> Res<()> {
         }
     }
 
-    println!("{} {}", env!("CARGO_BIN_NAME"), env!("CARGO_PKG_VERSION"));
-
     let urls_by_origin = args
         .urls
         .clone()
diff --git a/neqo-server/src/main.rs b/neqo-server/src/main.rs
index 50f3292c4e..9b924504cc 100644
--- a/neqo-server/src/main.rs
+++ b/neqo-server/src/main.rs
@@ -829,8 +829,6 @@ async fn main() -> Result<(), io::Error> {
         }
     }
 
-    println!("{} {}", env!("CARGO_BIN_NAME"), env!("CARGO_PKG_VERSION"));
-
     let mut servers_runner = ServersRunner::new(args)?;
     servers_runner.run().await
 }
diff --git a/qns/interop.sh b/qns/interop.sh
index 3c828ead9e..4baa6b7e8f 100755
--- a/qns/interop.sh
+++ b/qns/interop.sh
@@ -13,6 +13,7 @@ case "$ROLE" in
   client)
     /wait-for-it.sh sim:57832 -s -t 30
     sleep 5
+    neqo-client --help | head -n 1
     RUST_LOG=debug RUST_BACKTRACE=1 neqo-client --cc cubic --qns-test "$TESTCASE" \
         --qlog-dir "$QLOGDIR" --output-dir /downloads $REQUESTS
     ;;
@@ -27,6 +28,7 @@ case "$ROLE" in
         -name "$CERT" -passout pass: -out "$P12CERT"
     pk12util -d "sql:$DB" -i "$P12CERT" -W ''
     certutil -L -d "sql:$DB" -n "$CERT"
+    neqo-server --help | head -n 1
     RUST_LOG=info RUST_BACKTRACE=1 neqo-server --cc cubic --qns-test "$TESTCASE" \
         --qlog-dir "$QLOGDIR" -d "$DB" -k "$CERT" [::]:443
     ;;