Skip to content

Commit

Permalink
Merge 9e508dd into 7eb85f0
Browse files Browse the repository at this point in the history
  • Loading branch information
malafeev committed Jan 22, 2019
2 parents 7eb85f0 + 9e508dd commit 179fd16
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ language: java
jdk:
- oraclejdk8

git:
quiet: true

cache:
directories:
- $HOME/.m2/repository
Expand All @@ -20,7 +23,7 @@ before_install:

install:
# Override default travis to use the maven wrapper
- ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
- ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -q

script:
- ./travis/publish.sh
Expand Down
8 changes: 4 additions & 4 deletions travis/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,23 @@ if ! is_pull_request && build_started_by_tag; then
check_release_tag
fi

./mvnw install -nsu
./mvnw install -nsu -q

# If we are on a pull request, our only job is to run tests, which happened above via ./mvnw install
if is_pull_request; then
true
# If we are on master, we will deploy the latest snapshot or release version
# - If a release commit fails to deploy for a transient reason, delete the broken version from bintray and click rebuild
elif is_travis_branch_master; then
./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DskipTests deploy
./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -q -DskipTests deploy

# If the deployment succeeded, sync it to Maven Central. Note: this needs to be done once per project, not module, hence -N
if is_release_commit; then
./mvnw --batch-mode -s ./.settings.xml -nsu -N io.zipkin.centralsync-maven-plugin:centralsync-maven-plugin:sync
./mvnw --batch-mode -s ./.settings.xml -nsu -q -N io.zipkin.centralsync-maven-plugin:centralsync-maven-plugin:sync
fi

# If we are on a release tag, the following will update any version references and push a version tag for deployment.
elif build_started_by_tag; then
safe_checkout_master
./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DreleaseVersion="$(release_version)" -Darguments="-DskipTests" release:prepare
./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -q -DreleaseVersion="$(release_version)" -Darguments="-DskipTests" release:prepare
fi

0 comments on commit 179fd16

Please sign in to comment.