diff options
| author | Emilio Jesus Gallego Arias | 2019-02-17 01:03:12 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-02-20 13:34:15 +0100 |
| commit | 565a30614c6df16466f66cac1e517f9202612709 (patch) | |
| tree | 4deae898a650f25eb0288f7bfc1df0b151e9c9d2 /dev | |
| parent | 756b978dfee0e0c103a5244af21115233ad96358 (diff) | |
[azure] [ci] Build on Windows using Dune.
We may want to keep the make-based and Dune job, however the
make-based setup is tested by the INRIA workers so it may not be
needed.
In order for some test to run well, we always run in Dune with an
absolute path. The easiest way to get a portable absolute path is to
use OCaml itself so we introduce a small executable to do that.
While we are at it, we do some cleanup of the test-suite `dune` file,
in particular we remove useless comments, set `--no-buffer` so results
can be seen in real time, and recognize the `NJOBS` variable as we
have moved to a Dune version that supports env vars.
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 |