Browse Source

[CI] use the opam file to install opam deps

Andy Li 7 years ago
parent
commit
2d7cae6886
2 changed files with 9 additions and 4 deletions
  1. 6 3
      .travis.yml
  2. 3 1
      appveyor.yml

+ 6 - 3
.travis.yml

@@ -42,7 +42,6 @@ install_linux: &install_linux
       ocaml
       ocaml-native-compilers
       ocaml-findlib
-      camlp4
       libpcre3-dev
       zlib1g-dev
       libgtk2.0-dev
@@ -50,7 +49,9 @@ install_linux: &install_linux
       awscli
       $JOB_DEPENDENCIES
   - wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin system
-  - opam install sedlex xml-light extlib rope ptmap
+  - opam update
+  - opam pin add haxe . --no-action
+  - opam install haxe --deps-only
   # install neko
   - if [ ! $DEPLOY_NIGHTLIES ]; then
       sudo add-apt-repository ppa:haxe/snapshots -y;
@@ -101,7 +102,9 @@ install_osx: &install_osx
   - travis_retry brew bundle --file=tests/Brewfile
   - opam init --compiler=4.05.0
   - eval `opam config env`
-  - opam install camlp4 sedlex ocamlfind xml-light extlib rope ptmap
+  - opam update
+  - opam pin add haxe . --no-action
+  - opam install haxe --deps-only
   # install neko
   - if [ ! $DEPLOY_NIGHTLIES ]; then
       brew install neko --HEAD;

+ 3 - 1
appveyor.yml

@@ -40,7 +40,9 @@ install:
     - 7z x "opam.tar.xz" -so | 7z x -aoa -si -ttar
     - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && bash opam${ARCH}/install.sh"'
     - '%CYG_ROOT%/bin/bash -lc "opam init mingw \"https://github.com/fdopen/opam-repository-mingw.git\" --comp 4.02.3+mingw${ARCH}c --switch 4.02.3+mingw${ARCH}c --auto-setup --yes"'
-    - '%CYG_ROOT%/bin/bash -lc "opam install camlp4 sedlex ocamlfind xml-light extlib rope ptmap --yes"'
+    - '%CYG_ROOT%/bin/bash -lc "opam update --yes"'
+    - '%CYG_ROOT%/bin/bash -lc "opam pin add haxe \"$APPVEYOR_BUILD_FOLDER\" --no-action --yes"'
+    - '%CYG_ROOT%/bin/bash -lc "opam install haxe --deps-only --yes"'
     # Install neko
     - choco install neko --prerelease --ignore-dependencies -s 'https://ci.appveyor.com/nuget/neko' -y
     # Install php