Skip to content

Commit

Permalink
Merge pull request #321 from GoogleCloudPlatform/tswast-apt
Browse files Browse the repository at this point in the history
  • Loading branch information
dpebot authored Sep 1, 2016
2 parents 1748572 + 7f939de commit bbc8d5c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ addons:
# Grab shellcheck from the Debian repo.
# https://github.com/koalaman/shellcheck/wiki/TravisCI
- debian-sid
# Gradle PPA
- sourceline: 'ppa:cwchien/gradle'
packages:
- expect
- shellcheck
- gradle-3.0
before_install:
- openssl aes-256-cbc -K $encrypted_d17a6ce39290_key -iv $encrypted_d17a6ce39290_iv
-in gae-firebase-secrets.json.enc -out appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/gae-firebase-secrets.json
Expand Down
3 changes: 0 additions & 3 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ set -x
set -o pipefail
shopt -s globstar

add_ppa 'ppa:cwchien/gradle'
sudo apt-get -qqy install gradle-3.0

SKIP_TESTS=false
if [ -z "$GOOGLE_APPLICATION_CREDENTIALS" ] ; then
SKIP_TESTS=true
Expand Down

0 comments on commit bbc8d5c

Please sign in to comment.