diff --git a/.travis.yml b/.travis.yml index 699910f..3deef5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: global: - DOCKER_CFG=$HOME/.docker - DOCKER_REPO="viniciusam/oracledb" + - CACHE_DIR=$HOME/.cache - MAVEN_HOME=/usr/local/maven - MAVEN_CFG=$HOME/.m2 - API_DB_URL="127.0.0.1:1521:XE" @@ -23,8 +24,8 @@ env: cache: directories: - $DOCKER_CFG + - $CACHE_DIR - $MAVEN_CFG - - $MAVEN_HOME/lib/ext # Used to cache wagon-http lib. install: - bash .travis/maven_cfg.sh diff --git a/.travis/maven_cfg.sh b/.travis/maven_cfg.sh index f119682..7bc2855 100644 --- a/.travis/maven_cfg.sh +++ b/.travis/maven_cfg.sh @@ -2,23 +2,22 @@ set -ev cd $(dirname $(readlink -f $0)) -if [ -f $MAVEN_CFG/repository ]; then - echo "Using cached maven dependencies..." - exit 0 -fi - -if [ "$ORACLE_OTN_USER" == "" ] || [ "$ORACLE_OTN_PASSWORD" == "" ]; then - echo "Oracle OTN username/password not specified." - exit 1 -fi - # Download wagon-http recommended by Oracle. # On maven latest version this is not needed, but travis doesn't have it. -curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar" -sudo mv wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/ +if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then + curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar" + mv wagon-http-2.8-shaded.jar $CACHE_DIR/ + sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/ +else + echo "Using cached wagon-http..." + sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/ +fi # Create the settings file with oracle server config. -cp settings.xml $MAVEN_CFG/settings.xml -#cp settings.tmpl.xml $MAVEN_CFG/settings.xml -#sed -i -e "s|###USERNAME###|$ORACLE_OTN_USER|g" $MAVEN_CFG/settings.xml -#sed -i -e "s|###PASSWORD###|$ORACLE_OTN_PASSWORD|g" $MAVEN_CFG/settings.xml +# If file already exists, Oracle dependencies were cached on previous build. +if [ ! -f $MAVEN_CFG/.cached ]; then + cp settings.xml $MAVEN_CFG/settings.xml + touch $MAVEN_CFG/.cached +else + echo "Using cached maven settings..." +fi