windows/dkml: minor CI adjustments (#198)

* pin local opam files * remove mirage-crypto-ec from dkml-windows (test fail, let's not ship it)
mirage · Feb 24, 2024 · ccbf964 · ccbf964
1 parent 27cb3ec
commit ccbf964
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/dkml.yml b/.github/workflows/dkml.yml
@@ -50,10 +50,6 @@ jobs:
     runs-on: ${{ matrix.gh_os }}
     name: build / ${{ matrix.abi_pattern }}
 
-    # mirage-crypto does not support MSVC as of 2023-09-03. Remove
-    # this when MSVC is properly supported.
-    continue-on-error: true
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

diff --git a/ci/build-test.sh b/ci/build-test.sh
@@ -80,21 +80,17 @@ opamrun update
 
 # 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"
+#   2024-02-24: Remove mirage-crypto-ec on Windows since it results in test failures.
+packages_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_TOPOLOGICALSORT="$packages_TOPOLOGICALSORT"
         ;;
     *)
-        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"
+        packages_TOPOLOGICALSORT="$packages_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"
+opamrun pin add -y -n .
+opamrun install --yes --deps-only --with-test $(echo $packages_TOPOLOGICALSORT | tr ',' ' ')
+opamrun exec -- dune build -p "$packages_TOPOLOGICALSORT"
+opamrun exec -- dune runtest -p "$packages_TOPOLOGICALSORT"