diff --git a/.travis.yml b/.travis.yml index 249c1a3a..8e48c6ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,16 +37,14 @@ cache: matrix: include: - - os: linux - allow_failures: true - fast_finish: true - name: "Linux 64-bit Bionic" - dist: bionic - language: bash - env: - - GAMOS=linux - - PLATFORM=x86_64 - - VMTYPE=cache +# - os: linux +# name: "Linux 64-bit Bionic" +# dist: bionic +# language: bash +# env: +# - GAMOS=linux +# - PLATFORM=x86_64 +# - VMTYPE=cache - os: linux name: "Linux 64-bit Xenial" dist: xenial @@ -152,7 +150,7 @@ script: - if [ "$VMTYPE" == "build" ]; then $gam version extended | grep TLSv1\.[23]; fi # Builds should default TLS 1.2 or 1.3 to Google - if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail since server doesn't support our TLS version - export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")" -#- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi +- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi - if [ "$e2e" = true ]; then export gam_user=gam-travis-$jid@pdl.jaylee.us; fi - if [ "$e2e" = true ]; then openssl aes-256-cbc -K $encrypted_ab10ec38326e_key -iv $encrypted_ab10ec38326e_iv -in travis/oauth2service.json.enc -out $gampath/oauth2service.json -d; fi - if [ "$e2e" = true ]; then cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null; fi