diff options
| author | Gaëtan Gilbert | 2019-02-21 14:18:43 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert | 2019-02-21 14:18:43 +0100 |
| commit | 5f7bb95b6532a6983a2d1880aa531e4e4dd6568d (patch) | |
| tree | 668ac7028f2f0490c15054d93c6b0868eaed93ea /dev | |
| parent | 87b4657566d5d4f0ea3d40dae7ba470d957ffe76 (diff) | |
| parent | d6f88819f5279e94d33e0e15f6be1e368210af08 (diff) | |
Merge PR #9588: [azure] [ci] Build on Windows using Dune.
Reviewed-by: SkySkimmer
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/ci/azure-build.sh | 4 | ||||
| -rwxr-xr-x | dev/ci/azure-opam.sh | 2 | ||||
| -rwxr-xr-x | dev/ci/azure-test.sh | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/dev/ci/azure-build.sh b/dev/ci/azure-build.sh index c0030c566f..04c7d5db91 100755 --- a/dev/ci/azure-build.sh +++ b/dev/ci/azure-build.sh @@ -4,6 +4,4 @@ set -e -x cd $(dirname $0)/../.. -./configure -local -make -j 2 byte -make -j 2 world +make -f Makefile.dune coq coqide-server diff --git a/dev/ci/azure-opam.sh b/dev/ci/azure-opam.sh index 8a1e36659c..9448a03f4f 100755 --- a/dev/ci/azure-opam.sh +++ b/dev/ci/azure-opam.sh @@ -10,4 +10,4 @@ bash opam64/install.sh opam init default -a -y "https://github.com/fdopen/opam-repository-mingw.git#opam2" -c $OPAM_VARIANT --disable-sandboxing eval "$(opam env)" -opam install -y num ocamlfind ounit +opam install -y num ocamlfind dune ounit diff --git a/dev/ci/azure-test.sh b/dev/ci/azure-test.sh index 8813245e5a..80a3d2e083 100755 --- a/dev/ci/azure-test.sh +++ b/dev/ci/azure-test.sh @@ -4,6 +4,5 @@ set -e -x #NB: if we make test-suite from the main makefile we get environment #too large for exec error -cd $(dirname $0)/../../test-suite -make -j 2 clean -make -j 2 PRINT_LOGS=1 +cd $(dirname $0)/../../ +make -f Makefile.dune test-suite |