ci: Remove mirage-crypto-pk on Windows MSVC

mirage · Feb 9, 2024 · b5b1c91 · b5b1c91
1 parent 4f236b3
commit b5b1c91
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,8 @@
 *.ml linguist-language=OCaml
 
+# Shell scripts are required to be LF
+*.sh text eol=lf
+
 # https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_character_encoding?view=powershell-7.1
 *.ps1 text working-tree-encoding=UTF-16 eol=crlf
 *.psm1 text working-tree-encoding=UTF-16 eol=crlf

diff --git a/.github/workflows/dkml.yml b/.github/workflows/dkml.yml
@@ -35,7 +35,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  build:    
     strategy:
       matrix:
         include: #

diff --git a/ci/build-test.sh b/ci/build-test.sh
@@ -78,7 +78,23 @@ opamrun exec -- ocamlc -config
 # Update
 opamrun update
 
-# Make your own build logic!
-opamrun install --yes --deps-only -t mirage-crypto mirage-crypto-rng mirage-crypto-rng-lwt mirage-crypto-rng-mirage mirage-crypto-pk mirage-crypto-ec
-opamrun exec -- dune build -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-lwt,mirage-crypto-rng-mirage,mirage-crypto-pk,mirage-crypto-ec
-opamrun exec -- dune runtest -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-lwt,mirage-crypto-rng-mirage,mirage-crypto-pk,mirage-crypto-ec
+# Build logic
+#   2024-02-09: Remove mirage-crypto-pk on Windows since no portable GMP library (used by Zarith).
+#       mirage-crypto-ec has a test dependency on mirage-crypto-pk.
+packages_INSTALL="mirage-crypto mirage-crypto-rng mirage-crypto-rng-lwt mirage-crypto-rng-mirage"
+packages_BUILD_TOPOLOGICALSORT="mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-lwt,mirage-crypto-rng-mirage"
+packages_TEST_TOPOLOGICALSORT="mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-lwt,mirage-crypto-rng-mirage"
+case "$dkml_host_abi" in
+    windows_*)
+        packages_INSTALL="$packages_INSTALL mirage-crypto-ec"
+        packages_BUILD_TOPOLOGICALSORT="$packages_BUILD_TOPOLOGICALSORT,mirage-crypto-ec"
+        ;;
+    *)
+        packages_INSTALL="$packages_INSTALL mirage-crypto-pk mirage-crypto-ec"
+        packages_BUILD_TOPOLOGICALSORT="$packages_BUILD_TOPOLOGICALSORT,mirage-crypto-pk,mirage-crypto-ec"
+        packages_TEST_TOPOLOGICALSORT="$packages_TEST_TOPOLOGICALSORT,mirage-crypto-pk,mirage-crypto-ec"
+esac
+#   shellcheck disable=SC2086
+opamrun install --yes --deps-only --with-test $packages_INSTALL
+opamrun exec -- dune build -p "$packages_BUILD_TOPOLOGICALSORT"
+opamrun exec -- dune runtest -p "$packages_TEST_TOPOLOGICALSORT"
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ on: @@
       workflow_dispatch:
     jobs:
-      build:
+      build:
         strategy:
           matrix:
             include: #
@@ Expand Down @@