Skip to content
Snippets Groups Projects
Commit f0fdc028 authored by esaunders's avatar esaunders
Browse files

Updated to OpenJDK/OpenJFX and restructured Travis build.

parent 760ade53
No related branches found
No related tags found
No related merge requests found
language: cpp language: cpp
matrix: matrix:
include: include:
- compiler: clang - compiler: clang
os: linux os: linux
dist: trusty dist: bionic
sudo: required sudo: required
group: edge group: edge
- compiler: gcc - compiler: gcc
os: linux os: linux
dist: trusty dist: bionic
sudo: required sudo: required
group: edge group: edge
- compiler: clang
os: osx
- compiler: gcc - compiler: gcc
os: osx os: osx
addons:
apt:
update: true
packages:
- libafflib-dev
- libewf-dev
- libpq-dev
- autopoint
- libsqlite3-dev
- ant
- libcppunit-dev
- wget
- openjdk-8-jdk
- openjfx=8u161-b12-1ubuntu2
- libopenjfx-java=8u161-b12-1ubuntu2
- libopenjfx-jni=8u161-b12-1ubuntu2
homebrew:
update: true
packages:
- ant
- libewf
- gettext
- cppunit
- afflib
python: python:
- "2.7" - "2.7"
install: install:
- ./travis_build.sh - ./travis_install_libs.sh
before_script:
- if [ $TRAVIS_OS_NAME = linux ]; then
sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java;
sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac;
export PATH=/usr/bin:$PATH;
unset JAVA_HOME;
fi
- if [ $TRAVIS_OS_NAME = "osx" ]; then
export PATH=${PATH}:/usr/local/opt/gettext/bin;
fi
script: script:
- make check && if [ -f "tests/test-suite.log" ];then cat tests/test-suite.log; fi ; if [ -f "unit_tests/base/test-suite.log" ];then cat unit_tests/base/test-suite.log; fi - ./bootstrap && ./configure --prefix=/usr && make
- if test ${TRAVIS_OS_NAME} = "linux"; then cd release; ./release-unix.pl ci; fi - pushd bindings/java/ && ant -q dist-PostgreSQL && popd
- make check && if [ -f "tests/test-suite.log" ];then cat tests/test-suite.log; fi ; if [ -f "unit_tests/base/test-suite.log" ];then cat unit_tests/base/test-suite.log; fi
- if test ${TRAVIS_OS_NAME} = "linux"; then
pushd release && ./release-unix.pl ci && popd;
fi
...@@ -13,14 +13,6 @@ installLib() { ...@@ -13,14 +13,6 @@ installLib() {
cd .. cd ..
} }
if test ${TRAVIS_OS_NAME} = "linux"; then
sudo apt-get -qq update
sudo apt-get -y install libafflib-dev libewf-dev libpq-dev autopoint libsqlite3-dev ant libcppunit-dev wget
elif test ${TRAVIS_OS_NAME} = "osx"; then
export PATH=${PATH}:/usr/local/opt/gettext/bin
brew install ant libewf gettext cppunit afflib
fi
installLib libvhdi 20181227 installLib libvhdi 20181227
installLib libvmdk 20181227 installLib libvmdk 20181227
./bootstrap && ./configure --prefix=/usr && make > /dev/null
cd bindings/java/ && ant -q dist-PostgreSQL
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment