|
@@ -48,10 +48,6 @@ install_linux: &install_linux
|
|
|
ninja-build
|
|
|
awscli
|
|
|
$JOB_DEPENDENCIES
|
|
|
- - wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin system
|
|
|
- - 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;
|
|
@@ -82,6 +78,11 @@ install_linux: &install_linux
|
|
|
# Setup JDK
|
|
|
- jdk_switcher use oraclejdk7
|
|
|
- java -version
|
|
|
+ # ocaml dependencies
|
|
|
+ - wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin system
|
|
|
+ - opam update
|
|
|
+ - opam pin add haxe . --no-action
|
|
|
+ - opam install haxe --deps-only
|
|
|
# Build haxe
|
|
|
- make package_src -s
|
|
|
- opam config exec -- make -s STATICLINK=1 libs
|
|
@@ -100,11 +101,6 @@ install_osx: &install_osx
|
|
|
- brew uninstall --force brew-cask # https://github.com/caskroom/homebrew-cask/pull/15381
|
|
|
- travis_retry brew tap Homebrew/bundle
|
|
|
- travis_retry brew bundle --file=tests/Brewfile
|
|
|
- - opam init
|
|
|
- - eval `opam config env`
|
|
|
- - opam update
|
|
|
- - opam pin add haxe . --no-action
|
|
|
- - opam install haxe --deps-only
|
|
|
# install neko
|
|
|
- if [ ! $DEPLOY_NIGHTLIES ]; then
|
|
|
brew install neko --HEAD;
|
|
@@ -131,6 +127,12 @@ install_osx: &install_osx
|
|
|
sudo ninja install;
|
|
|
popd;
|
|
|
fi
|
|
|
+ # ocaml dependencies
|
|
|
+ - opam init
|
|
|
+ - eval `opam config env`
|
|
|
+ - opam update
|
|
|
+ - opam pin add haxe . --no-action
|
|
|
+ - opam install haxe --deps-only
|
|
|
# Build haxe
|
|
|
- make -s STATICLINK=1 "LIB_PARAMS=/usr/local/opt/zlib/lib/libz.a /usr/local/lib/libpcre.a" libs
|
|
|
- make -s -j STATICLINK=1 "LIB_PARAMS=/usr/local/opt/zlib/lib/libz.a /usr/local/lib/libpcre.a" haxe
|