Skip to content

Commit 6061474

Browse files
author
Gebal, Jacek
committed
Fixing build matrix
1 parent 68a0184 commit 6061474

File tree

3 files changed

+82
-9
lines changed

3 files changed

+82
-9
lines changed

.travis.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,32 @@ env:
2929
##utPLSQL variables
3030
- UTPLSQL_DIR="utPLSQL"
3131
- UTPLSQL_V2_DIR="utPLSQL_V2"
32+
- MAVEN_HOME=/usr/local/maven
33+
- MAVEN_CFG=$HOME/.m2
3234
matrix:
33-
- UTPLSQL_3_VERSION='v3.0.0'
34-
- UTPLSQL_3_VERSION='v3.0.1'
35-
- UTPLSQL_3_VERSION='v3.0.2'
36-
- UTPLSQL_3_VERSION='v3.0.3'
37-
- UTPLSQL_3_VERSION='v3.0.4'
38-
- UTPLSQL_3_VERSION='latest'
35+
- UTPLSQL_3_VERSION='v3.0.0' RELEASE_ID=6394329
36+
- UTPLSQL_3_VERSION='v3.0.1' RELEASE_ID=6716262
37+
- UTPLSQL_3_VERSION='v3.0.2' RELEASE_ID=7085296
38+
- UTPLSQL_3_VERSION='v3.0.3' RELEASE_ID=7293900
39+
- UTPLSQL_3_VERSION='v3.0.4' RELEASE_ID=8372513
40+
- UTPLSQL_3_VERSION='latest' RELEASE_ID='latest'
3941

4042
before_install:
4143
# download travis-oracle
4244
- wget 'https://github.com/cbandy/travis-oracle/archive/v2.0.3.tar.gz'
4345
- mkdir -p .travis/oracle
4446
- tar x -C .travis/oracle --strip-components=1 -f v2.0.3.tar.gz
4547
# download latest utPLSQL release
46-
- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/${UTPLSQL_3_VERSION} | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
48+
- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/${RELEASE_ID} | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
4749
- unzip -q utPLSQL.zip
4850
# download utPLSQL v.2.3.1 release
4951
- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/3608515 | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
5052
- unzip -d ${UTPLSQL_V2_DIR} -q utplsql-2-3-1.zip
5153
# download utPLSQL-cli
52-
- curl -Lk -o utPLSQL-cli.zip https://bintray.com/viniciusam/utPLSQL-cli/download_file?file_path=utPLSQL-cli-develop-201706191645.zip
53-
- unzip -q utPLSQL-cli.zip
54+
- curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip
55+
- unzip -q utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
56+
#Download Oracle jdc via maven
57+
- bash .travis/maven_cfg.sh
5458
# download Oracle XE installer for Travis
5559
- .travis/oracle/download.sh
5660

.travis/maven_cfg.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
set -ev
3+
cp .travis/settings.xml $MAVEN_CFG/settings.xml
4+
5+
cd $(dirname $(readlink -f $0))
6+
7+
# Download wagon-http recommended by Oracle.
8+
# On maven latest version this is not needed, but travis doesn't have it.
9+
if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then
10+
curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar"
11+
mv wagon-http-2.8-shaded.jar $CACHE_DIR/
12+
sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
13+
else
14+
echo "Using cached wagon-http..."
15+
sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
16+
fi
17+
18+
mvn dependency:copy-dependencies -DoutputDirectory=../utPLSQL-cli/lib

.travis/settings.xml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
25+
26+
<servers>
27+
<server>
28+
<id>maven.oracle.com</id>
29+
<username>${env.ORACLE_OTN_USER}</username>
30+
<password>${env.ORACLE_OTN_PASSWORD}</password>
31+
<configuration>
32+
<basicAuthScope>
33+
<host>ANY</host>
34+
<port>ANY</port>
35+
<realm>OAM 11g</realm>
36+
</basicAuthScope>
37+
<httpConfiguration>
38+
<all>
39+
<params>
40+
<property>
41+
<name>http.protocol.allow-circular-redirects</name>
42+
<value>%b,true</value>
43+
</property>
44+
</params>
45+
</all>
46+
</httpConfiguration>
47+
</configuration>
48+
</server>
49+
</servers>
50+
51+
</settings>

0 commit comments

Comments
 (0)