Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

windows/dkml: opam install with deps-only and with-test only packages to test, deps-only for only build #198

Merged
merged 6 commits into from
Feb 24, 2024
Merged

windows/dkml: opam install with deps-only and with-test only packages to test, deps-only for only build #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96ed78f
windows/dkml: opam install with deps-only and with-test only packages…
hannesm Feb 22, 2024
9c51e0f
ci/dkml: opam likes packages separated by space, not comma
hannesm Feb 22, 2024
d5df90f
mirage-crypto-ec can now be tested as well
hannesm Feb 23, 2024
857b582
pin local opam files
hannesm Feb 23, 2024
b04421a
dkml: no continue on error anymore
hannesm Feb 23, 2024
c6d096c
as suggested by @jonahbeckford, remove mirage-crypto-ec from dkml-win…
hannesm Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/dkml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 8 additions & 12 deletions ci/build-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading