diff options
| author | Maxime Dénès | 2018-11-29 08:27:49 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2018-11-29 08:27:49 +0100 |
| commit | 4b12cd00e1d32961a4dc04e2c2dcbfe6ed0002fa (patch) | |
| tree | 0295e44ec86a55097a0d1f5718b1250e04305863 | |
| parent | 1ca73b4ba5e16af3baed6c804d0d0eeaac9eccd5 (diff) | |
| parent | e6c98655e3c98ea6b9fed5e906edf860da097707 (diff) | |
Merge PR #9054: [ci] [appveyor] Move Appveyor to OPAM 2.
| -rw-r--r-- | appveyor.yml | 3 | ||||
| -rw-r--r-- | dev/ci/appveyor.sh | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/appveyor.yml b/appveyor.yml index c9c6bc0684..7420856214 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,8 +2,7 @@ version: '{branch}~{build}' clone_depth: 10 cache: - - C:\cygwin64 -> dev\ci\appveyor.bat - - C:\cygwin64\home\appveyor\.opam -> dev\ci\appveyor.sh + - C:\cygwin64 -> dev\ci\appveyor.bat, dev\ci\appveyor.sh platform: - x64 diff --git a/dev/ci/appveyor.sh b/dev/ci/appveyor.sh index abeb039c0e..cda369fb1b 100644 --- a/dev/ci/appveyor.sh +++ b/dev/ci/appveyor.sh @@ -2,14 +2,15 @@ set -e -x -APPVEYOR_OPAM_SWITCH=4.07.0+mingw64c +APPVEYOR_OPAM_VARIANT=ocaml-variants.4.07.1+mingw64c -wget https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.1/opam64.tar.xz +wget https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam64.tar.xz -O opam64.tar.xz tar -xf opam64.tar.xz bash opam64/install.sh -opam init -a mingw https://github.com/fdopen/opam-repository-mingw.git --comp $APPVEYOR_OPAM_SWITCH --switch $APPVEYOR_OPAM_SWITCH -eval "$(opam config env)" +opam init default -a -y "https://github.com/fdopen/opam-repository-mingw.git#opam2" -c $APPVEYOR_OPAM_VARIANT --disable-sandboxing +eval "$(opam env)" opam install -y num ocamlfind ounit +# Full regular Coq Build cd "$APPVEYOR_BUILD_FOLDER" && ./configure -local && make && make byte && make -C test-suite all INTERACTIVE= # && make validate |