From a99ae3c2e8193a0a7863c00b76d990989e1932c4 Mon Sep 17 00:00:00 2001 From: Roberto Franchini Date: Wed, 15 Jun 2016 17:30:28 +0200 Subject: [PATCH 1/7] add support for SNAPSHOTs --- .travis.yml | 2 ++ ci/_bash_utils.sh | 49 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 453018ca..e925fc76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,8 @@ branches: env: matrix: + - ORIENTDB_VERSION=2.2.3-SNAPSHOT + - ORIENTDB_VERSION=2.2.2 - ORIENTDB_VERSION=2.2.0 - ORIENTDB_VERSION=2.1.5 - ORIENTDB_VERSION=2.1.2 diff --git a/ci/_bash_utils.sh b/ci/_bash_utils.sh index 78b16a39..b88c2401 100755 --- a/ci/_bash_utils.sh +++ b/ci/_bash_utils.sh @@ -2,17 +2,20 @@ build(){ -# if command_exists "mvn" && [[ "$1" != *"-"* ]] && [[ "$1" != *"SNAPSHOT"* ]] && [[ "$1" != *"2.0"* ]]; then -# echo "Build started with MAVEN" -# build_via_mvn $1 $2 -# el - if [[ "$1" == *"SNAPSHOT"* ]]; then - echo "Build by clone/pull github develop branch" - build_via_git $1 $2 + ODB_VERSION=$1 + ODB_COMPILED_NAME="orientdb-community-${ODB_VERSION}" + ODB_ARCHIVED_NAME="orientdb-${ODB_VERSION}" + ODB_PACKAGE_EXT="tar.gz" + ODB_COMPRESSED=${ODB_COMPILED_NAME}.${ODB_PACKAGE_EXT} + OUTPUT_DIR="${2:-$(pwd)}" + + if [[ "${ODB_VERSION}" == *"SNAPSHOT"* ]]; then + download "https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=com.orientechnologies&a=orientdb-community&v=${ODB_VERSION}&e=tar.gz" $OUTPUT_DIR ${ODB_COMPRESSED} else - echo "Build by download from github repository" - build_via_github $1 $2 + download "http://central.maven.org/maven2/com/orientechnologies/orientdb-community/${ODB_VERSION}/orientdb-community-${ODB_VERSION}.tar.gz" $OUTPUT_DIR ${ODB_COMPRESSED} fi + extract "$OUTPUT_DIR/$ODB_COMPRESSED" $OUTPUT_DIR + } @@ -20,6 +23,28 @@ command_exists () { type "$1" >/dev/null 2>&1 ; } +download () { + OUTPUT_DIR=$2 + PACKAGE_NAME=$3 + + if [ ! -d "$OUTPUT_DIR" ]; then + mkdir "$OUTPUT_DIR" + fi + + if command_exists "wget" ; then + echo "wget -q -O $OUTPUT_DIR/$PACKAGE_NAME $1" + wget -q -O "$OUTPUT_DIR/$PACKAGE_NAME" "$1" + elif command_exists "curl" ; then + echo "cd ${OUTPUT_DIR}" + cd ${OUTPUT_DIR} + echo "curl --silent -L $1 \"$OUTPUT_DIR/$PACKAGE_NAME\"" + curl --silent -L $1 --output "$OUTPUT_DIR/$PACKAGE_NAME" + else + echo "Cannot download $1 [missing wget or curl]" + exit 1 + fi +} + extract(){ ODB_PACKAGE_PATH=$1 @@ -59,8 +84,8 @@ download () { elif command_exists "curl" ; then echo "cd ${OUTPUT_DIR}" cd ${OUTPUT_DIR} - echo "curl --silent -L $1 \"$OUTPUT_DIR/$PACKAGE_NAME\"" - curl --silent -L $1 --output "$OUTPUT_DIR/$PACKAGE_NAME" + echo "curl --silent -LO $1" + curl --silent -LO $1 else echo "Cannot download $1 [missing wget or curl]" exit 1 @@ -71,7 +96,6 @@ build_via_git (){ ODB_VERSION=$1 CI_DIR=$2 - ODB_ARCHIVED_NAME="orientdb-${ODB_VERSION}" cd ${CI_DIR} if [ ! -d "orientdb-develop" ]; then @@ -87,6 +111,7 @@ build_via_git (){ fi git pull origin develop + ant clean install echo "mvn clean install -DskipTests" mvn clean install -DskipTests From 38f4f12c44d4d822f94404f1a540eb2fa87aa7ed Mon Sep 17 00:00:00 2001 From: Roberto Franchini Date: Wed, 15 Jun 2016 17:40:12 +0200 Subject: [PATCH 2/7] cleanup orientDB versions --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e925fc76..5d6fc07a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,10 +44,8 @@ env: - ORIENTDB_VERSION=2.2.3-SNAPSHOT - ORIENTDB_VERSION=2.2.2 - ORIENTDB_VERSION=2.2.0 - - ORIENTDB_VERSION=2.1.5 - - ORIENTDB_VERSION=2.1.2 - - ORIENTDB_VERSION=2.1.1 - - ORIENTDB_VERSION=2.1.0 - - ORIENTDB_VERSION=2.0.13 + - ORIENTDB_VERSION=2.1.19 + - ORIENTDB_VERSION=2.1.18 + - ORIENTDB_VERSION=2.0.18 global: - secure: "FfqHFu2i1X5dIqzIxIGraEZrGSswSE4XVR7Ig9fkfYhbQfhFfZCOaRG95tyoZW7g5S0K2Kiw/oDyIKMPC+5g5PfMv2uvI/LZtokOy5ZewF0SHMjuCA54P+y83uindQMfb6KvPc9h/6tV2eogQGZ1y+juXteb4NRDUxt27NppRwM=" From f2d126c6e0970e6c414089190a4c16ee16beee3c Mon Sep 17 00:00:00 2001 From: Roberto Franchini Date: Fri, 24 Jun 2016 10:38:03 +0200 Subject: [PATCH 3/7] adds new 3.0.0-SNAPSHOT version --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e43e6a8..b9be5fc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,8 @@ branches: env: matrix: - - ORIENTDB_VERSION=2.2.3-SNAPSHOT + - ORIENTDB_VERSION=3.0.0-SNAPSHOT + - ORIENTDB_VERSION=2.2.3 - ORIENTDB_VERSION=2.2.2 - ORIENTDB_VERSION=2.2.0 - ORIENTDB_VERSION=2.1.19 From dbaa04d3227240b4590fb60bfe78127edb7dbf05 Mon Sep 17 00:00:00 2001 From: Roberto Franchini Date: Thu, 21 Jul 2016 12:19:01 +0200 Subject: [PATCH 4/7] updates stable versions to 2.2.5, 2.2.4 and snapshots to 2.2.6-SNAPSHOT --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9be5fc2..e06fcfd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,9 +42,10 @@ branches: env: matrix: - ORIENTDB_VERSION=3.0.0-SNAPSHOT + - ORIENTDB_VERSION=2.2.6-SNAPSHOT + - ORIENTDB_VERSION=2.2.5 + - ORIENTDB_VERSION=2.2.4 - ORIENTDB_VERSION=2.2.3 - - ORIENTDB_VERSION=2.2.2 - - ORIENTDB_VERSION=2.2.0 - ORIENTDB_VERSION=2.1.19 - ORIENTDB_VERSION=2.1.18 - ORIENTDB_VERSION=2.0.18 From 1e83835c8b67e57a3d661267441aa359b688cbf1 Mon Sep 17 00:00:00 2001 From: Roberto Franchini Date: Sat, 13 Aug 2016 10:25:24 +0200 Subject: [PATCH 5/7] updates stable versions of OrientDB: 2.2.6, 2.2.7, 2.1.21 --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index e06fcfd7..6d45caa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,12 +42,10 @@ branches: env: matrix: - ORIENTDB_VERSION=3.0.0-SNAPSHOT - - ORIENTDB_VERSION=2.2.6-SNAPSHOT - - ORIENTDB_VERSION=2.2.5 - - ORIENTDB_VERSION=2.2.4 - - ORIENTDB_VERSION=2.2.3 - - ORIENTDB_VERSION=2.1.19 - - ORIENTDB_VERSION=2.1.18 + - ORIENTDB_VERSION=2.2.7 + - ORIENTDB_VERSION=2.2.6 + - ORIENTDB_VERSION=2.1.21 + - ORIENTDB_VERSION=2.1.20 - ORIENTDB_VERSION=2.0.18 global: - secure: "FfqHFu2i1X5dIqzIxIGraEZrGSswSE4XVR7Ig9fkfYhbQfhFfZCOaRG95tyoZW7g5S0K2Kiw/oDyIKMPC+5g5PfMv2uvI/LZtokOy5ZewF0SHMjuCA54P+y83uindQMfb6KvPc9h/6tV2eogQGZ1y+juXteb4NRDUxt27NppRwM=" From b76b537caa4a23bb924d95d252ae2fa26e53a92a Mon Sep 17 00:00:00 2001 From: Roberto Franchini Date: Fri, 9 Sep 2016 15:43:37 +0200 Subject: [PATCH 6/7] OrientDB versions updated to recent stables: 2.2.9, 2.1.23 --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34c01c37..625481b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,11 @@ branches: env: matrix: - ORIENTDB_VERSION=3.0.0-SNAPSHOT - - ORIENTDB_VERSION=2.2.7 - - ORIENTDB_VERSION=2.2.6 - - ORIENTDB_VERSION=2.1.21 - - ORIENTDB_VERSION=2.1.20 + - ORIENTDB_VERSION=2.2.10-SNAPSHOT + - ORIENTDB_VERSION=2.2.9 + - ORIENTDB_VERSION=2.2.8 + - ORIENTDB_VERSION=2.1.23 + - ORIENTDB_VERSION=2.1.22 - ORIENTDB_VERSION=2.0.18 global: - secure: "FfqHFu2i1X5dIqzIxIGraEZrGSswSE4XVR7Ig9fkfYhbQfhFfZCOaRG95tyoZW7g5S0K2Kiw/oDyIKMPC+5g5PfMv2uvI/LZtokOy5ZewF0SHMjuCA54P+y83uindQMfb6KvPc9h/6tV2eogQGZ1y+juXteb4NRDUxt27NppRwM=" From b0be16397e7a6c5aa9ddb0200d8ba6f46cd99d17 Mon Sep 17 00:00:00 2001 From: Roberto Franchini Date: Tue, 15 Nov 2016 18:20:28 +0100 Subject: [PATCH 7/7] versions update --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9eb62924..d47673ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,11 +43,11 @@ branches: env: matrix: - ORIENTDB_VERSION=3.0.0-SNAPSHOT - - ORIENTDB_VERSION=2.2.12-SNAPSHOT - - ORIENTDB_VERSION=2.2.11 - - ORIENTDB_VERSION=2.2.10 + - ORIENTDB_VERSION=2.2.14-SNAPSHOT + - ORIENTDB_VERSION=2.2.13 + - ORIENTDB_VERSION=2.2.12 + - ORIENTDB_VERSION=2.1.25 - ORIENTDB_VERSION=2.1.24 - - ORIENTDB_VERSION=2.1.23 - ORIENTDB_VERSION=2.0.18 global: - secure: "FfqHFu2i1X5dIqzIxIGraEZrGSswSE4XVR7Ig9fkfYhbQfhFfZCOaRG95tyoZW7g5S0K2Kiw/oDyIKMPC+5g5PfMv2uvI/LZtokOy5ZewF0SHMjuCA54P+y83uindQMfb6KvPc9h/6tV2eogQGZ1y+juXteb4NRDUxt27NppRwM="