Merge branch 'main' of https://github.com/mozilla/neqo into qns-ci

mozilla · Mar 6, 2024 · 626dd04 · 626dd04
2 parents 33ce044 + 6f407c9
commit 626dd04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -81,6 +81,8 @@ jobs:
             taskset -c 0 nice -n -20 \
             cargo +$TOOLCHAIN flamegraph -v -c "$PERF_CMD" \
               --bin neqo-server -- --db ../test-fixture/db $HOST:4433 || true; } &
+          # Give the server time to start.
+          sleep 3
           mkdir client; \
             cd client; \
             time taskset -c 1 nice -n -20 \

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -118,6 +118,8 @@ jobs:
           cargo +${{ matrix.rust-toolchain }} build $BUILD_TYPE --bin neqo-client --bin neqo-server
           cargo +${{ matrix.rust-toolchain }} run $BUILD_TYPE --bin neqo-server -- $HOST:4433 &
           PID=$!
+          # Give the server time to start.
+          sleep 3
           cargo +${{ matrix.rust-toolchain }} run $BUILD_TYPE --bin neqo-client -- --output-dir . https://$HOST:4433/$SIZE
           kill $PID
           [ "$(wc -c <"$SIZE")" -eq "$SIZE" ] || exit 1

diff --git a/neqo-server/Cargo.toml b/neqo-server/Cargo.toml
@@ -23,5 +23,5 @@ neqo-http3 = { path = "./../neqo-http3" }
 neqo-qpack = { path = "./../neqo-qpack" }
 neqo-transport = { path = "./../neqo-transport" }
 qlog = { version = "0.12", default-features = false }
-regex = { version = "1.9", default-features = false }
+regex = { version = "1.9", default-features = false, features = ["unicode-perl"] }
 tokio = { version = "1", default-features = false, features = ["net", "time", "macros", "rt", "rt-multi-thread"] }