chore: add explicit MCENTRAL=Y to Travis jobs that deploy to Maven Ce…

…ntral
pgjdbc · May 14, 2016 · 18ca8f227a6c1310162e328d18c3ae6041cabee8 · 18ca8f2
1 parent f6ed8e6
commit 18ca8f227a6c1310162e328d18c3ae6041cabee8
Unified Split

Showing with 13 additions and 7 deletions.

+8 −3 .travis.yml

+5 −0 travis_build.sh

+0 −4 travis_deploy.sh
diff --git a/.travis.yml b/.travis.yml
@@ -71,14 +71,19 @@ matrix:
      env:
        - PG_VERSION=9.4
        - COVERAGE=Y
+        - MCENTRAL=Y
    - jdk: openjdk7
      addons:
        postgresql: "9.4"
-      env: PG_VERSION=9.4
+      env:
+        - PG_VERSION=9.4
+        - MCENTRAL=Y
    - jdk: openjdk6
      addons:
        postgresql: "9.4"
-      env: PG_VERSION=9.4
+      env:
+        - PG_VERSION=9.4
+        - MCENTRAL=Y
    - jdk: oraclejdk8
      addons:
        postgresql: "9.3"
@@ -131,4 +136,4 @@ matrix:

 # Deploy snapshots to Maven Central
 after_success:
-  - "test $TRAVIS_PULL_REQUEST == 'false' && test $TRAVIS_BRANCH == 'master' && test $PG_VERSION == '9.4' && ./travis_deploy.sh"
+  - "test $MCENTRAL == 'Y' && ./travis_deploy.sh"
diff --git a/travis_build.sh b/travis_build.sh
@@ -5,6 +5,11 @@ set -x -e
 MVN_ARGS="clean package -B -V $MVN_CUSTOM_ARGS"
 MVN_PROFILES="release"

+if [[ "${NO_WAFFLE_NO_OSGI}" == *"Y"* ]];
+then
+    MVN_ARGS="$MVN_ARGS -DwaffleEnabled=false -DosgiEnabled=false -DexcludePackageNames=org.postgresql.osgi:org.postgresql.sspi"
+fi
+
 if [[ "${COVERAGE}" == *"Y"* ]];
 then
    MVN_PROFILES="$MVN_PROFILES,coverage"
diff --git a/travis_deploy.sh b/travis_deploy.sh
@@ -3,10 +3,6 @@ set -x -e

 # Skip tests and checkstype to speed up snapshot deployment
 MVN_ARGS="clean deploy -B -V -DskipTests -Dcheckstyle.skip=true -Dskip.assembly=true --settings settings.xml"
-if [[ "${NO_WAFFLE_NO_OSGI}" == *"Y"* ]];
-then
-    MVN_ARGS="$MVN_ARGS -DwaffleEnabled=false -DosgiEnabled=false -DexcludePackageNames=org.postgresql.osgi:org.postgresql.sspi"
-fi

 if [[ "${TRAVIS_JDK_VERSION}" == *"jdk6"* ]];
 then