From 93204f23592148f6d53569fd47e7fb98066ee327 Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Mon, 22 Jan 2024 12:39:06 +0900 Subject: [PATCH 1/6] The "ci" branch runs CI --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 29061f948..2fe69936f 100755 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,10 +1,10 @@ name: Tests on: - pull_request: - push: - branches: - - master + push: + branches: [ 'master', 'ci' ] + pull_request: + branches: [ 'master' ] jobs: stack: From ebc10d768c4f65d550aea91d73a52ea6f45856dc Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Mon, 22 Jan 2024 12:41:14 +0900 Subject: [PATCH 2/6] using http2 v5.1.0 for CI --- stack-lts-18.yaml | 2 +- stack-lts-19.yaml | 2 +- stack-lts-20.yaml | 2 +- stack-lts-21.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stack-lts-18.yaml b/stack-lts-18.yaml index 91bd5dbf0..00f981328 100644 --- a/stack-lts-18.yaml +++ b/stack-lts-18.yaml @@ -26,7 +26,7 @@ extra-deps: - crypton-x509-1.7.6 - crypton-x509-store-1.6.9 - crypton-x509-validation-1.6.12 - - http2-5.0.0 + - http2-5.1.0 - network-byte-order-0.1.7 - network-control-0.0.2 - tls-1.7.0 diff --git a/stack-lts-19.yaml b/stack-lts-19.yaml index aaffb25b0..94f360422 100644 --- a/stack-lts-19.yaml +++ b/stack-lts-19.yaml @@ -30,7 +30,7 @@ extra-deps: - crypton-x509-system-1.6.7 - crypton-x509-validation-1.6.12 - fast-logger-3.2.2 - - http2-5.0.0 + - http2-5.1.0 - http3-0.0.7 - memory-0.18.0 - network-3.1.4.0 diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml index de991d56b..f05a31048 100644 --- a/stack-lts-20.yaml +++ b/stack-lts-20.yaml @@ -31,7 +31,7 @@ extra-deps: - crypton-x509-system-1.6.7 - crypton-x509-validation-1.6.12 - fast-logger-3.2.2 - - http2-5.0.0 + - http2-5.1.0 - http3-0.0.7 - memory-0.18.0 - multipart-0.2.1 diff --git a/stack-lts-21.yaml b/stack-lts-21.yaml index 935d841d6..345afc815 100644 --- a/stack-lts-21.yaml +++ b/stack-lts-21.yaml @@ -29,7 +29,7 @@ extra-deps: - crypton-x509-store-1.6.9 - crypton-x509-system-1.6.7 - crypton-x509-validation-1.6.12 - - http2-5.0.0 + - http2-5.1.0 - http3-0.0.7 - network-control-0.0.2 - network-udp-0.0.0 From 3ee56d5d33e4b11a04506190516999ccfdc32e3f Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Mon, 22 Jan 2024 13:12:44 +0900 Subject: [PATCH 3/6] using http3 v0.0.8 --- stack-lts-19.yaml | 2 +- stack-lts-20.yaml | 2 +- stack-lts-21.yaml | 2 +- stack-nightly.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stack-lts-19.yaml b/stack-lts-19.yaml index 94f360422..c2b3c265d 100644 --- a/stack-lts-19.yaml +++ b/stack-lts-19.yaml @@ -31,7 +31,7 @@ extra-deps: - crypton-x509-validation-1.6.12 - fast-logger-3.2.2 - http2-5.1.0 - - http3-0.0.7 + - http3-0.0.8 - memory-0.18.0 - network-3.1.4.0 - network-byte-order-0.1.7 diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml index f05a31048..8e0b107b5 100644 --- a/stack-lts-20.yaml +++ b/stack-lts-20.yaml @@ -32,7 +32,7 @@ extra-deps: - crypton-x509-validation-1.6.12 - fast-logger-3.2.2 - http2-5.1.0 - - http3-0.0.7 + - http3-0.0.8 - memory-0.18.0 - multipart-0.2.1 - network-byte-order-0.1.7 diff --git a/stack-lts-21.yaml b/stack-lts-21.yaml index 345afc815..e09e0c785 100644 --- a/stack-lts-21.yaml +++ b/stack-lts-21.yaml @@ -30,7 +30,7 @@ extra-deps: - crypton-x509-system-1.6.7 - crypton-x509-validation-1.6.12 - http2-5.1.0 - - http3-0.0.7 + - http3-0.0.8 - network-control-0.0.2 - network-udp-0.0.0 - quic-0.1.12 diff --git a/stack-nightly.yaml b/stack-nightly.yaml index 2527fef3c..e581758c1 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -25,7 +25,7 @@ nix: - zlib extra-deps: - crypto-token-0.1.0 - - http3-0.0.7 + - http3-0.0.8 - network-udp-0.0.0 - quic-0.1.15 - sockaddr-0.0.1 \ No newline at end of file From df50ba3b76a7652ddb75d90450a9361858371918 Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Mon, 22 Jan 2024 14:04:12 +0900 Subject: [PATCH 4/6] adding http2 to nightly --- stack-nightly.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/stack-nightly.yaml b/stack-nightly.yaml index e581758c1..cc371ba5f 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -25,6 +25,7 @@ nix: - zlib extra-deps: - crypto-token-0.1.0 + - http2-5.1.0 - http3-0.0.8 - network-udp-0.0.0 - quic-0.1.15 From 7bbea15f1acf82308c0da211a77cf3bb1ebbceab Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Mon, 22 Jan 2024 14:19:14 +0900 Subject: [PATCH 5/6] adding http2 --- stack.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 9923c3dce..f6b7791e8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -24,7 +24,8 @@ nix: - zlib extra-deps: - crypto-token-0.1.0 - - http3-0.0.7 + - http2-5.1.0 + - http3-0.0.8 - network-udp-0.0.0 - quic-0.1.14 - sockaddr-0.0.1 From e836fa4990e6be9d4ab65a70a6884a2a52b3f72e Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Mon, 22 Jan 2024 17:33:20 +0900 Subject: [PATCH 6/6] adding PackIntSpec --- warp/test/PackIntSpec.hs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 warp/test/PackIntSpec.hs diff --git a/warp/test/PackIntSpec.hs b/warp/test/PackIntSpec.hs new file mode 100644 index 000000000..cfaf0cdf5 --- /dev/null +++ b/warp/test/PackIntSpec.hs @@ -0,0 +1,14 @@ +module PackIntSpec (spec) where + +import qualified Data.ByteString.Char8 as C8 +import Network.Wai.Handler.Warp.PackInt +import Test.Hspec +import Test.Hspec.QuickCheck +import qualified Test.QuickCheck as QC + +spec :: Spec +spec = describe "readInt64" $ do + prop "" $ \n -> packIntegral (abs n :: Int) == C8.pack (show (abs n)) + prop "" $ \(QC.Large n) -> + let n' = fromIntegral (abs n :: Int) + in packIntegral (n' :: Int) == C8.pack (show n')