From 59e33c271fed82f64409de4c1d1267687f7d816a Mon Sep 17 00:00:00 2001 From: Felix Paulusma Date: Mon, 11 Dec 2023 00:56:02 +0100 Subject: [PATCH 1/2] adjusted all 'stack.yaml's and git actions yaml to have CI work, hopefully --- .github/workflows/tests.yml | 6 ++--- stack-lts-18.yaml | 44 +++++++++++++++++++++++++++++++++++++ stack-lts-19.yaml | 43 ++++++++++++++++++++++++++++++++++++ stack-lts-20.yaml | 33 +++++++++++++++++++--------- stack-nightly.yaml | 19 +++++++++++----- stack.yaml | 27 +++++++++++++++-------- 6 files changed, 145 insertions(+), 27 deletions(-) create mode 100644 stack-lts-18.yaml create mode 100644 stack-lts-19.yaml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fe4db1ba0..22201cd91 100755 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,12 +18,12 @@ jobs: - "--resolver nightly --stack-yaml stack-nightly.yaml" - "--resolver lts-21" - "--resolver lts-20 --stack-yaml stack-lts-20.yaml" - - "--resolver lts-19" - - "--resolver lts-18" + - "--resolver lts-19 --stack-yaml stack-lts-19.yaml" + - "--resolver lts-18 --stack-yaml stack-lts-18.yaml" steps: - name: Clone project - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Getting weird OS X errors... # - name: Cache dependencies diff --git a/stack-lts-18.yaml b/stack-lts-18.yaml new file mode 100644 index 000000000..39acb92e2 --- /dev/null +++ b/stack-lts-18.yaml @@ -0,0 +1,44 @@ +resolver: lts-18 +packages: +- ./auto-update +- ./mime-types +- ./recv +- ./time-manager +- ./wai +- ./wai-app-static +- ./wai-conduit +- ./wai-extra +- ./wai-frontend-monadcgi +- ./wai-http2-extra +- ./wai-websockets +- ./warp +- ./warp-quic +- ./warp-tls +flags: + wai-extra: + build-example: true +nix: + enable: false + packages: + - fcgi + - zlib +extra-deps: + - crypto-token-0.0.2 + - crypton-0.34 + - crypton-x509-1.7.6 + - crypton-x509-store-1.6.9 + - crypton-x509-system-1.6.7 + - crypton-x509-validation-1.6.12 + - fast-logger-3.2.2 + - http2-5.0.0 + - http3-0.0.7 + - memory-0.18.0 + - network-3.1.4.0 + - network-byte-order-0.1.7 + - network-control-0.0.2 + - network-udp-0.0.0 + - quic-0.1.12 + - random-1.2.1.1 + - sockaddr-0.0.1 + - tls-1.9.0 + - unix-time-0.4.11 diff --git a/stack-lts-19.yaml b/stack-lts-19.yaml new file mode 100644 index 000000000..aaffb25b0 --- /dev/null +++ b/stack-lts-19.yaml @@ -0,0 +1,43 @@ +resolver: lts-19 +packages: +- ./auto-update +- ./mime-types +- ./recv +- ./time-manager +- ./wai +- ./wai-app-static +- ./wai-conduit +- ./wai-extra +- ./wai-frontend-monadcgi +- ./wai-http2-extra +- ./wai-websockets +- ./warp +- ./warp-quic +- ./warp-tls +flags: + wai-extra: + build-example: true +nix: + enable: false + packages: + - fcgi + - zlib +extra-deps: + - crypto-token-0.0.2 + - crypton-0.34 + - crypton-x509-1.7.6 + - crypton-x509-store-1.6.9 + - crypton-x509-system-1.6.7 + - crypton-x509-validation-1.6.12 + - fast-logger-3.2.2 + - http2-5.0.0 + - http3-0.0.7 + - memory-0.18.0 + - network-3.1.4.0 + - network-byte-order-0.1.7 + - network-control-0.0.2 + - network-udp-0.0.0 + - quic-0.1.12 + - sockaddr-0.0.1 + - tls-1.9.0 + - unix-time-0.4.11 diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml index 7f6cdc41b..de991d56b 100644 --- a/stack-lts-20.yaml +++ b/stack-lts-20.yaml @@ -1,18 +1,19 @@ -resolver: lts-20.26 +resolver: lts-20 packages: -- ./recv - ./auto-update - ./mime-types +- ./recv +- ./time-manager - ./wai -- ./wai-extra -- ./warp -- ./warp-tls +- ./wai-conduit - ./wai-app-static +- ./wai-extra - ./wai-frontend-monadcgi - ./wai-http2-extra - ./wai-websockets -- ./wai-conduit -- ./time-manager +- ./warp +- ./warp-quic +- ./warp-tls flags: wai-extra: build-example: true @@ -22,10 +23,22 @@ nix: - fcgi - zlib extra-deps: - - crypton-0.33 + - cgi-3001.5.0.1 + - crypto-token-0.0.2 + - crypton-0.34 - crypton-x509-1.7.6 - crypton-x509-store-1.6.9 + - crypton-x509-system-1.6.7 - crypton-x509-validation-1.6.12 - - tls-1.8.0 - - cgi-3001.5.0.1 + - fast-logger-3.2.2 + - http2-5.0.0 + - http3-0.0.7 + - memory-0.18.0 - multipart-0.2.1 + - network-byte-order-0.1.7 + - network-control-0.0.2 + - network-udp-0.0.0 + - quic-0.1.12 + - sockaddr-0.0.1 + - tls-1.9.0 + - unix-time-0.4.11 diff --git a/stack-nightly.yaml b/stack-nightly.yaml index 2256c9a29..ceb6883b0 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1,18 +1,19 @@ -resolver: nightly-2023-09-09 +resolver: nightly packages: -- ./recv - ./auto-update - ./mime-types +- ./recv +- ./time-manager - ./wai - ./wai-extra -- ./warp -- ./warp-tls - ./wai-app-static - ./wai-frontend-monadcgi - ./wai-http2-extra - ./wai-websockets - ./wai-conduit -- ./time-manager +- ./warp +- ./warp-quic +- ./warp-tls flags: wai-extra: build-example: true @@ -21,3 +22,11 @@ nix: packages: - fcgi - zlib +extra-deps: + - crypto-token-0.0.2 + - crypton-0.34 + - http3-0.0.7 + - network-udp-0.0.0 + - quic-0.1.12 + - sockaddr-0.0.1 + - tls-1.9.0 diff --git a/stack.yaml b/stack.yaml index 2dde447ea..935d841d6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,18 +1,19 @@ -resolver: lts-21.11 +resolver: lts-21.21 packages: -- ./recv - ./auto-update - ./mime-types +- ./recv +- ./time-manager - ./wai -- ./wai-extra -- ./warp -- ./warp-tls - ./wai-app-static +- ./wai-conduit +- ./wai-extra - ./wai-frontend-monadcgi - ./wai-http2-extra - ./wai-websockets -- ./wai-conduit -- ./time-manager +- ./warp +- ./warp-quic +- ./warp-tls flags: wai-extra: build-example: true @@ -22,8 +23,16 @@ nix: - fcgi - zlib extra-deps: - - crypton-0.33 + - crypto-token-0.0.2 + - crypton-0.34 - crypton-x509-1.7.6 - crypton-x509-store-1.6.9 + - crypton-x509-system-1.6.7 - crypton-x509-validation-1.6.12 - - tls-1.8.0 + - http2-5.0.0 + - http3-0.0.7 + - network-control-0.0.2 + - network-udp-0.0.0 + - quic-0.1.12 + - sockaddr-0.0.1 + - tls-1.9.0 From daa90dda0826c94bdae4451349e653796662b219 Mon Sep 17 00:00:00 2001 From: Felix Paulusma Date: Mon, 11 Dec 2023 01:32:04 +0100 Subject: [PATCH 2/2] apparently 'quic' can't be built on LTS-18 --- stack-lts-18.yaml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/stack-lts-18.yaml b/stack-lts-18.yaml index 39acb92e2..91bd5dbf0 100644 --- a/stack-lts-18.yaml +++ b/stack-lts-18.yaml @@ -12,7 +12,6 @@ packages: - ./wai-http2-extra - ./wai-websockets - ./warp -- ./warp-quic - ./warp-tls flags: wai-extra: @@ -23,22 +22,12 @@ nix: - fcgi - zlib extra-deps: - - crypto-token-0.0.2 - - crypton-0.34 + - crypton-0.33 - crypton-x509-1.7.6 - crypton-x509-store-1.6.9 - - crypton-x509-system-1.6.7 - crypton-x509-validation-1.6.12 - - fast-logger-3.2.2 - http2-5.0.0 - - http3-0.0.7 - - memory-0.18.0 - - network-3.1.4.0 - network-byte-order-0.1.7 - network-control-0.0.2 - - network-udp-0.0.0 - - quic-0.1.12 - - random-1.2.1.1 - - sockaddr-0.0.1 - - tls-1.9.0 + - tls-1.7.0 - unix-time-0.4.11