diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | ci/snap/deploy.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 26e129a5e2..e4ced8ceb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -158,7 +158,7 @@ jobs: env: - CLANG_SANITIZER=TSAN - *common-job-env - - if: false + - if: type != pull_request name: snap os: linux env: diff --git a/ci/snap/deploy.sh b/ci/snap/deploy.sh index 3f959c05e5..5fbd52d775 100755 --- a/ci/snap/deploy.sh +++ b/ci/snap/deploy.sh @@ -7,7 +7,8 @@ set -o pipefail # [[ "$TRAVIS_TAG" != "$TRAVIS_BRANCH" ]] && exit 0 mkdir -p .snapcraft -openssl aes-256-cbc -K $encrypted_ece1c4844832_key -iv $encrypted_ece1c4844832_iv +# shellcheck disable=SC2154 +openssl aes-256-cbc -K "$encrypted_ece1c4844832_key" -iv "$encrypted_ece1c4844832_iv" \ -in ci/snap/travis_snapcraft.cfg -out .snapcraft/snapcraft.cfg -d SNAP=$(find ./ -name "*.snap") @@ -18,4 +19,3 @@ if [[ "$SNAP" =~ "dirty" || "$SNAP" =~ "nightly" ]]; then else snapcraft push "$SNAP" --release candidate fi - |