Permalink
Browse files

chore: make sure TEST_CLIENTS performs regular tests as well

  • Loading branch information...
vlsi committed Jan 28, 2018
1 parent 6fe76a3 commit aa676bb39117dc47cbd51a236b232227e9128220
Showing with 8 additions and 16 deletions.
  1. +0 −6 .travis.yml
  2. +8 −10 .travis/travis_build.sh
@@ -202,12 +202,6 @@ matrix:
- PG_VERSION=9.3
- QUERY_MODE=extendedForPrepared
- COVERAGE=Y
- jdk: oraclejdk8
addons:
postgresql: "9.6"
env:
- PG_VERSION=9.6
- TEST_CLIENTS=Y
- jdk: oraclejdk8
addons:
postgresql: "9.4"
@@ -36,10 +36,7 @@ then
MVN_ARGS="$MVN_ARGS -Dcurrent.jdk=1.9 -Djavac.target=1.9"
fi
if [[ "$TEST_CLIENTS" ]];
then
mvn clean install -B -V -DskipTests $MVN_CUSTOM_ARGS
elif [[ "$JDOC" == *"Y"* ]];
if [[ "$JDOC" == *"Y"* ]];
then
# Build javadocs for Java 8 only
mvn ${MVN_ARGS} -P ${MVN_PROFILES},release-artifacts
@@ -57,9 +54,16 @@ else
mvn ${MVN_ARGS} -P ${MVN_PROFILES}
fi
if [[ "${COVERAGE}" == "Y" ]];
then
pip install --user codecov
codecov
fi
# Run Scala-based and Clojure-based tests
if [[ "${TEST_CLIENTS}" == *"Y" ]];
then
# Pgjdbc should be in "local maven repository" so the clients can use it. Mvn commands above just package it.
mvn -DskipTests install
mkdir -p $HOME/.sbt/launchers/0.13.12
@@ -78,9 +82,3 @@ then
#cd java.jdbc
#TEST_DBS=postgres TEST_POSTGRES_USER=test TEST_POSTGRES_DBNAME=test mvn test -Djava.jdbc.test.pgjdbc.version=$PROJECT_VERSION
fi
if [[ "${COVERAGE}" == "Y" ]];
then
pip install --user codecov
codecov
fi

0 comments on commit aa676bb

Please sign in to comment.