tyler.durden
/
snappy-java
mirror of https://github.com/xerial/snappy-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Give up using Travis for docker build

This commit is contained in:
xerial 2017-01-19 22:50:04 -08:00
parent 0c00a0cd6a
commit 9c89e5c3af
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -16,9 +16,9 @@ jdk:
script: script:
- if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then - if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
make native-all && sbt ++$TRAVIS_SCALA_VERSION "; test; publish"; sbt ++$TRAVIS_SCALA_VERSION "; test; publish";
else else
make linux64 && sbt ++$TRAVIS_SCALA_VERSION test; sbt ++$TRAVIS_SCALA_VERSION test;
fi; fi;
else else
sbt ++$TRAVIS_SCALA_VERSION test; sbt ++$TRAVIS_SCALA_VERSION test;

2
Makefile
View File

@ -146,7 +146,7 @@ $(TARGET)/$(snappy-jar-version).jar:
test: $(NATIVE_DLL) test: $(NATIVE_DLL)
$(SBT) test $(SBT) test
DOCKER_RUN_OPTS=--privileged DOCKER_RUN_OPTS=--rm
win32: jni-header win32: jni-header
./docker/dockcross-windows-x86 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86' ./docker/dockcross-windows-x86 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86'