gha: Don't pull lwt packages when building async packages

Signed-off-by: Antonin Décimo <[email protected]>
mirage · Jun 24, 2024 · a88bbe7 · a88bbe7
1 parent d48876c
commit a88bbe7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -56,8 +56,7 @@ jobs:
           opam-local-packages: ${{ matrix.local-packages }}
 
       - run: |
-          sudo apt update
-          sudo apt upgrade
+          sudo apt-get update && sudo apt-get upgrade
           opam depext conf-libcurl
         if: ${{ matrix.os == 'ubuntu-latest' }}
 
@@ -81,6 +80,12 @@ jobs:
         local-packages:
           - |
             *.opam
+            !cohttp-mirage.opam
+            !cohttp-curl-lwt.opam
+            !cohttp-lwt-jsoo.opam
+            !cohttp-lwt-unix.opam
+            !cohttp-lwt.opam
+            !cohttp-server-lwt-unix.opam
             !cohttp-eio.opam
             !cohttp-bench.opam
 
@@ -100,17 +105,16 @@ jobs:
           opam-local-packages: ${{ matrix.local-packages }}
 
       - run: |
-          sudo apt update
-          sudo apt upgrade
+          sudo apt-get update && sudo apt-get upgrade
           opam depext conf-libcurl
         if: ${{ matrix.os == 'ubuntu-latest' }}
 
       - run: echo "PKG_CONFIG_PATH=$(brew --prefix openssl)/lib/pkgconfig" >>"$GITHUB_ENV"
         if: ${{ matrix.os == 'macos-latest' }}
 
-      - run: opam install --with-test --deps-only http cohttp cohttp-lwt cohttp-lwt-unix cohttp-server-lwt-unix cohttp-async cohttp-curl-async cohttp-mirage cohttp-curl-lwt cohttp-curl cohttp-top
-      - run: opam exec -- dune build http cohttp cohttp-lwt cohttp-lwt-unix cohttp-server-lwt-unix cohttp-async cohttp-curl-async cohttp-mirage cohttp-curl-lwt cohttp-curl cohttp-top
-      - run: opam exec -- dune runtest http cohttp cohttp-lwt cohttp-lwt-unix cohttp-server-lwt-unix cohttp-async cohttp-curl-async cohttp-mirage cohttp-curl-lwt cohttp-curl cohttp-top
+      - run: opam install --with-test --deps-only http cohttp cohttp-async cohttp-curl-async cohttp-curl cohttp-top
+      - run: opam exec -- dune build http cohttp cohttp-async cohttp-curl-async cohttp-curl cohttp-top
+      - run: opam exec -- dune runtest http cohttp cohttp-async cohttp-curl-async cohttp-curl cohttp-top
 
   build-test-cohttp-eio:
     if: github.event.pull_request.draft == false

diff --git a/cohttp-curl-async.opam b/cohttp-curl-async.opam
@@ -27,8 +27,9 @@ depends: [
   "cohttp-curl" {= version}
   "core" {>= "v0.16.0"}
   "core_unix" {>= "v0.14.0"}
-  "async_kernel"
-  "async_unix"
+  "core_kernel" {with-test}
+  "async_kernel" {with-test & >= "v0.17.0"}
+  "async_unix" {with-test}
   "cohttp-async" {with-test & = version}
   "uri" {with-test & >= "4.2.0"}
   "fmt" {with-test}

diff --git a/dune-project b/dune-project
@@ -322,8 +322,9 @@
    (>= v0.16.0))
   (core_unix
    (>= v0.14.0))
-  async_kernel
-  async_unix
+  (core_kernel :with-test)
+  (async_kernel (and :with-test (>= v0.17.0)))
+  (async_unix :with-test)
   (cohttp-async
    (and
     :with-test