From 8c5a6e06fddbbb707730e1efe2563b82f3d8c834 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 29 May 2017 14:46:59 +0100 Subject: [PATCH] travis-ci: remove defensive checks --- travis-ci/travis-coveralls-report.sh | 6 +----- travis-ci/travis-deploy.sh | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/travis-ci/travis-coveralls-report.sh b/travis-ci/travis-coveralls-report.sh index 5ef727d..aab1704 100755 --- a/travis-ci/travis-coveralls-report.sh +++ b/travis-ci/travis-coveralls-report.sh @@ -1,7 +1,3 @@ #!/usr/bin/env bash -## Only send coveralls reports from Travis-CI. Some CIs, like Shippable, lie by setting TRAVIS=true. -## Currently, Shippable, does not set TRAVIS_LANGUAGE, but Travis-CI does. -if [ "$TRAVIS_LANGUAGE" = "java" ];then - ./mvnw --projects builder,plugin test jacoco:report coveralls:report -fi +./mvnw --projects builder,plugin test jacoco:report coveralls:report diff --git a/travis-ci/travis-deploy.sh b/travis-ci/travis-deploy.sh index cdc921b..240dd26 100755 --- a/travis-ci/travis-deploy.sh +++ b/travis-ci/travis-deploy.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash -## Only deploy from Travis-CI. Some CIs, like Shippable, lie by setting TRAVIS=true. -## Currently, Shippable, does not set TRAVIS_LANGUAGE, but Travis-CI does. -if [ "$TRAVIS_LANGUAGE" = "java" ] && [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then +if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then openssl aes-256-cbc -K $encrypted_efec3258f55d_key -iv $encrypted_efec3258f55d_iv \ -in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d gpg --batch --fast-import travis-ci/codesigning.asc