Now that the Travis build is working I'm reverting back to the original format.

This commit is contained in:
esaunders 2020-09-01 13:09:09 -04:00
parent 6f9e1b2da7
commit 595f8142e0

View File

@ -1,85 +1,67 @@
{ language: java
"language": "java",
"os": [ jobs:
"linux" include:
], - os: linux
"dist": "bionic", dist: bionic
"jobs": { - os: osx
"include": [
{ env:
"os": "linux", global:
"dist": "bionic" - TSK_HOME=$TRAVIS_BUILD_DIR/sleuthkit/sleuthkit
},
{ addons:
"os": "osx" apt:
} update: true
] packages:
}, - testdisk
"env": { - libafflib-dev
"global": [ - libewf-dev
{ - libpq-dev
"TSK_HOME": "$TRAVIS_BUILD_DIR/sleuthkit/sleuthkit" - autopoint
} - libsqlite3-dev
] - ant
}, - ant-optional
"addons": { - libcppunit-dev
"apt": { - wget
"update": true, homebrew:
"packages": [ update: true
"testdisk", packages:
"libafflib-dev", - ant
"libewf-dev", - wget
"libpq-dev", - libpq
"autopoint", - libewf
"libsqlite3-dev", - gettext
"ant", - cppunit
"ant-optional", - afflib
"libcppunit-dev", - testdisk
"wget"
] python:
}, - 2.7
"homebrew": {
"update": true, before_install:
"packages": [ - git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit
"ant", - python setupSleuthkitBranch.py
"wget",
"libpq", install:
"libewf", - pushd sleuthkit/sleuthkit && ./travis_install_libs.sh && popd
"gettext",
"cppunit", before_script:
"afflib", - if [ $TRAVIS_OS_NAME = linux ]; then
"testdisk" wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -;
] echo \"deb [arch=amd64] https://apt.bell-sw.com/ stable main\" | sudo tee /etc/apt/sources.list.d/bellsoft.list;
} sudo apt-get update;
}, sudo apt-get install bellsoft-java11-full;
"python": [ export PATH=/usr/bin:$PATH;
"2.7" export JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64;
], fi
"before_install": [ - if [ $TRAVIS_OS_NAME = osx ]; then
"git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit", brew uninstall java --force --ignore-dependencies;
"python setupSleuthkitBranch.py" brew cask uninstall java --force;
], brew tap bell-sw/liberica;
"install": [ brew cask install liberica-jdk11-full;
"pushd sleuthkit/sleuthkit && ./travis_install_libs.sh && popd" export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-11-full.jdk/Contents/Home;
], fi
"before_script": [ java -version
"if [ $TRAVIS_OS_NAME = linux ]; then
wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -; script: ./travis_build.sh
echo \"deb [arch=amd64] https://apt.bell-sw.com/ stable main\" | sudo tee /etc/apt/sources.list.d/bellsoft.list;
sudo apt-get update;
sudo apt-get install bellsoft-java11-full;
export PATH=/usr/bin:$PATH;
export JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64;
fi",
"if [ $TRAVIS_OS_NAME = osx ]; then
brew uninstall java --force --ignore-dependencies;
brew cask uninstall java --force;
brew tap bell-sw/liberica;
brew cask install liberica-jdk11-full;
export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-11-full.jdk/Contents/Home;
/usr/libexec/java_home -V;
fi",
"java -version"
],
"script": ./travis_build.sh
}