Skip to content

Commit

Permalink
Update Travis configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
ctrueden committed Dec 26, 2017
1 parent 5c663b6 commit 167a5f7
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 36 deletions.
19 changes: 16 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
language: java
jdk: oraclejdk8
branches:
only: master
install: ".travis/build.sh"
script: ".travis/test.sh"
only:
- master
- "/.*-[0-9]+\\..*/"
install: true
script:
- ".travis/build.sh"
- ".travis/test.sh"
cache:
directories:
- "~/.m2/repository"
env:
global:
- secure: PL5tKNK2AgEKP1YAfbf+HjVjYyUg8W4ec55rYchdIVBtR4uQptjFKVwOcknOgp1FiV8HUQZKTnQXy6j+ztciksFzpz4vkjnRI/9ESH7a+FXbyP0LJ0rZ3dg4JXTYg6FPILhbLideCB+wHek4vY/3wdMp1MSms9pECWNnIgXi1eATLwsKyzMGn/EVEP3tN4CCoQ0oYuQRR4K8ttFQ4MK+4bLK/nfw73+lDsaR+nuAaktINOVe874Jl95qR0BIZuJiJB3YkSPV+PuYU84JIwurnibcjm2B8k3Yst90KqJCHMuqRGAdz+x4AsAluUwxq/Ac2sX8Y1hGLd3ZgUPffcvNnWty53YU1QIiXdokjlN+LLOn5mnD5zePnqhMC1Tlyk6BzsOjYFwtIXzT/QInBxQMQMQDEP2T0MQHCCeheqhr9F8zXagbMSvpanR5hekN7e5eyt28SwWVLAraCOfTHmcodGdFdYE6ULK1LTlPlagJksHK9yBuu8b7+P5oi9zjQw/Z9IiE1cfl8aNiHvrjYhxlZW65pqBVmj/InLHyHUpFkf5YIVOgn2Ll+wziXCkZ+5gNt4LOIkhJsqadEXmN027SqOMBNhXp4XuiR078WdP6i986zlw7pJ/g4dcS/1doic8tgeKU4hEDI7X1fP+WX1ymg4RXmpk+IWV46bthvY2DcgU=
- secure: SzBNubDYw66XjLqJQpeLgX3e/eHsasD7ZvXoGE8Ap8x34gSPfFnG39AOkCKKBK0Eyz/ywtxnNXRERuljFCpU+iCSBEsYrRnx8q5PL4a4gce8Cg0hm8E6EeL5Wguu/01H8Vg/ALTKiai2L0NWGNQD5EDcZqwk18S8TmFkhyof5IgjF+35O6MgY/lLedpW7svislEbTghlJ9R+PTQDEoreKB6LTZ8K8GsDqGOL8/ycRdB4IdAAsdprR1iTfG6w/ynVciEHOHGanu/tL+5YTum+AfaneS9qefz9sO1ICpu/B8fLm0Tgq4jYbhz702mrHmHIzEb8pEUgqBGypngIzQenaL78Mb5o/uuYcNGkGrLaNI2F+xrNiYu/VTcHyRpPtlaPaxpq3T6KWFVLUusdjbcSj4n/szEmXYc+R3r+7+peCuWCZ85/+Zsn9PktEw+dz3bhnBQSHpABBrPoTZ4U9dEucF9ke0HXoxBNk8X5XJF5XciGLU/9om3mdbDSQwzWjU5X9ufEyfjw3jpZ3llaK3Xf+9n3//FKO3EAfPjTKZKpWkUnXJY2EEfhQBQnQGACVk7XdKodt4uK7xDnItQIELDMGEOFdbJ578zsWJVsfSm8S7QIJWgyw0HbcOTTqnMuu6SUvRWJOnBrj8qIH4IqFHyqnBdRBhyKaQsBCGzvNC8ncXw=
- secure: JJutmOIfb87XB/ebx8mC401w43PttcX0N8M86l79EpC3bnY+i1YqSyJcyYWVsR8YtxwQ+JNxZwmiopUZm45oK5PYZVXxgnWASegN9aNK0ZrA//ilwALiIFdWQBEXYlf2XB+ltUKU84RwAocm5IWTNWOm6WU+L0zt3f9d235piC6IfxwFs8CFmEsoFUS754NHDzdJHx+88Egni7gEuISo3Cmnitdy23FAG3fAv0TIm8ttKG0bbCWf6HXRBPGbtTl+IW+nIkMczMOOtb7MenMDi1NbE3IR1NwhC7miH0L8HEkwkbUXpNlC4jQZwVDfnqRxLHVqGWZBCmlFUviIRiKuAMmvVTrVu5zPgh1Qs7MD1w5tPxKJgrWm/x9/7eGj9MFWQsYBdAAGIPtmXVO5lVo8bpfFe44Vlhirq944vyt55kZSWHEFVIShgGeEi6ib1MVV6OA+IxWs9pp/DDwTv+SLXB2FTKKJhb6QZmcCM1N+Tqu9j7rxkmgcEisWVnCsuJhEwQPMBLmrb4qk3zZEYI/lEzT6RwEjPEJ7kfGXUbI+nCuStdIyWrk2mZRWzLeQGhpqDtX+mw+7me48VoUbx+MF5ouDUZJjN2Jtw/eQbRtMw+jWcAGHRWWEqz3AMJKsvoBhzb7nxY6/9D6M7KbLbIRvlu19qKKLNOFc7m9uRMV8uLU=
- secure: Wv58642sicjXKREaUQT6XXmFUzibSL8fmqVepWNfNpe9WnQt/Ka1WqxObE/llR2QxNgB4vg2eT36SUUMRIXd3gHc9rhW0E8oeNGdEus0J1+1afYIgFgoITuCNaSgEgJO1RQnftVx5ETCHMBG9+xJIry8+kQPbpwHdk74TWJylL9I9FP3cdpEKQd/YVzvElkxkeg2eyCYsahc0uT4Op3/ST/yXX0oqZTUM1LnsCCEzhlVCinuDOi0rpTV1+amKkxrDdsxiOUpGj6LtgJPv2hYd1E0t3qHz3LaWmkuZVc7eTBlYhFTFq4HZ3Do2bSSVpKhKpy0EdL0vwwPNCKGu+ql2kIHAvCi1O601/vD9HGUs4X/0KW8fRDRl4I16F5V0hkCNLSVQu6UDN8qckz3tE/atY6JvdPkC0v1bZjK8itSGOiyVZfLgtCb5NUYiNIUpDISD+KyVs0VFxgL9xjSrvOXes/G/44S94NbNtUlfGM758DVLbNIkFmUp/U0C8Ui3ZN5ZH3O0LmTeD+2Ikgh5XPNU2S9QwwJFpZTXoQFik3fPoG+zwPv0U0afShn2ijknMstmDC9W0jqRCxyVRj2jpFLHUiryq0R0u/NxZ6DWGLBUl7TVLTcDQTZBXJRvn5bLmmyCT2d7N9DdQD0VBEEi+ftmEcAVNrlMSkFHaPG4dS8i6g=
12 changes: 2 additions & 10 deletions .travis/build.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
#!/bin/sh
dir="$(dirname "$0")"
if [ "$TRAVIS_SECURE_ENV_VARS" = true \
-a "$TRAVIS_PULL_REQUEST" = false \
-a "$TRAVIS_BRANCH" = master ]
then
mvn install -Pimagej --settings "$dir/settings.xml"
#mvn -Pdeploy-to-imagej deploy --settings "$dir/settings.xml"
else
mvn install -Pimagej --settings "$dir/settings.xml"
fi
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh
sh travis-build.sh $encrypted_bb54e4f72874_key $encrypted_bb54e4f72874_iv
23 changes: 0 additions & 23 deletions .travis/settings.xml

This file was deleted.

Binary file added .travis/signingkey.asc.enc
Binary file not shown.
3 changes: 3 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
<license.copyrightOwners>Hadrien Mary</license.copyrightOwners>
<netbeans.hint.license>apache20</netbeans.hint.license>

<!-- NB: Deploy releases to the ImageJ Maven repository. -->
<releaseProfiles>deploy-to-imagej</releaseProfiles>

<commons-cli.version>1.4</commons-cli.version>
<json-simple.version>1.1.1</json-simple.version>
<beaker-kernel-base.version>0.9.1</beaker-kernel-base.version>
Expand Down

0 comments on commit 167a5f7

Please sign in to comment.