aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-07-23 18:10:52 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-07-23 18:10:52 -0700
commitb4c6af5a0f304f98acdfd436ed794511d0a0fbaf (patch)
treefe2bf7a44df5f25957f61f3a65815cf7195a0f87
parent4eaf126e1431f13683d849ad2e232057129a085f (diff)
parentf7d5b848abdced707a76b1fc63a1519e7a77493e (diff)
downloadjackson-core-b4c6af5a0f304f98acdfd436ed794511d0a0fbaf.tar.gz
Merge branch '2.10' into 2.11
-rw-r--r--.travis.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index b6cc08cc..98c6a1bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,16 +10,14 @@ jdk:
# https://knowm.org/configure-travis-ci-to-deploy-snapshots/
before_install: "git clone -b travis `git config --get remote.origin.url` target/travis"
-after_success: "mvn deploy --settings target/travis/settings.xml"
+script: "[ ${TRAVIS_PULL_REQUEST} = 'false' ] && mvn clean deploy --settings target/travis/settings.xml || mvn clean verify --settings target/travis/settings.xml"
# whitelist
branches:
only:
- - master
- "2.11"
env:
global:
- secure: "YW0hrdsHvH41pb5uPJ2DGzXrBgOVT7nEyag/bAQoDcSlOQ/g55tnY6rIGkqE/aYD47IroTEhW4yLyM3tZpbrqwagX4dUX90ukjcUwUvFE1ePTSEfdBtuHVwl8f6HmLIIw2yK0dQ1gOJ21T+3g+wddvK+6sWBJJ+s3O1FePDh6X0="
- secure: "sGQxvyfg98BFcJcWHQ5BjvDNhbwdgD1yEfkE3qzH4/gzwD/ND1jKhkCX++Glt3DuyAKhENNzXlSkztdCE5wKfK3X6MVvOgzMgiV/BhHIf09EtAjZ35fe4pr+GZImfGZO3qkViooTz3FDJyKJBA3YyMTuo9/eWK8HlUFCZHTjKP8="
-