Skip to content

Commit 3716840

Browse files
committed
Fix travis build cache
1 parent 25de681 commit 3716840

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
global:
1313
- DOCKER_CFG=$HOME/.docker
1414
- DOCKER_REPO="viniciusam/oracledb"
15+
- CACHE_DIR=$HOME/.cache
1516
- MAVEN_HOME=/usr/local/maven
1617
- MAVEN_CFG=$HOME/.m2
1718
- API_DB_URL="127.0.0.1:1521:XE"
@@ -23,8 +24,8 @@ env:
2324
cache:
2425
directories:
2526
- $DOCKER_CFG
27+
- $CACHE_DIR
2628
- $MAVEN_CFG
27-
- $MAVEN_HOME/lib/ext # Used to cache wagon-http lib.
2829

2930
install:
3031
- bash .travis/maven_cfg.sh

.travis/maven_cfg.sh

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,22 @@
22
set -ev
33
cd $(dirname $(readlink -f $0))
44

5-
if [ -f $MAVEN_CFG/repository ]; then
6-
echo "Using cached maven dependencies..."
7-
exit 0
8-
fi
9-
10-
if [ "$ORACLE_OTN_USER" == "" ] || [ "$ORACLE_OTN_PASSWORD" == "" ]; then
11-
echo "Oracle OTN username/password not specified."
12-
exit 1
13-
fi
14-
155
# Download wagon-http recommended by Oracle.
166
# On maven latest version this is not needed, but travis doesn't have it.
17-
curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar"
18-
sudo mv wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
7+
if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then
8+
curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar"
9+
mv wagon-http-2.8-shaded.jar $CACHE_DIR/
10+
sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
11+
else
12+
echo "Using cached wagon-http..."
13+
sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
14+
fi
1915

2016
# Create the settings file with oracle server config.
21-
cp settings.xml $MAVEN_CFG/settings.xml
22-
#cp settings.tmpl.xml $MAVEN_CFG/settings.xml
23-
#sed -i -e "s|###USERNAME###|$ORACLE_OTN_USER|g" $MAVEN_CFG/settings.xml
24-
#sed -i -e "s|###PASSWORD###|$ORACLE_OTN_PASSWORD|g" $MAVEN_CFG/settings.xml
17+
# If file already exists, Oracle dependencies were cached on previous build.
18+
if [ ! -f $MAVEN_CFG/.cached ]; then
19+
cp settings.xml $MAVEN_CFG/settings.xml
20+
touch $MAVEN_CFG/.cached
21+
else
22+
echo "Using cached maven settings..."
23+
fi

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy