diff --git a/.travis.yml b/.travis.yml index ca964b3d4..fc44bcdc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ matrix: include: - env: SBT_COURSIER=1 - env: SBT_SHADING=1 + - env: SBT_PGP_COURSIER=1 branches: only: - master diff --git a/scripts/travis.sh b/scripts/travis.sh index f9197a284..ec40389b9 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -7,20 +7,27 @@ downloadInstallSbtExtras() { chmod +x bin/sbt } +sbtPgpCoursier() { + [ "${SBT_PGP_COURSIER:-""}" = 1 ] +} + sbtShading() { [ "${SBT_SHADING:-""}" = 1 ] } runSbtCoursierTests() { - addPgpKeys - ./scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/scripted - sbt ++$TRAVIS_SCALA_VERSION sbt-pgp-coursier/scripted + ./scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/test sbt-coursier/scripted } runSbtShadingTests() { sbt ++$TRAVIS_SCALA_VERSION sbt-shading/scripted } +runSbtPgpCoursierTests() { + addPgpKeys + sbt ++$TRAVIS_SCALA_VERSION sbt-pgp-coursier/scripted +} + addPgpKeys() { for key in b41f2bce 9fa47a44 ae548ced b4493b94 53a97466 36ee59d9 dc426429 3b80305d 69e0a56c fdd5c0cd 35543c27 70173ee5 111557de 39c263a9; do gpg --keyserver keyserver.ubuntu.com --recv "$key" @@ -32,6 +39,8 @@ downloadInstallSbtExtras if sbtShading; then runSbtShadingTests +elif sbtPgpCoursier; then + runSbtPgpCoursierTests else runSbtCoursierTests fi