From c76e4fd62175d6f58159a4109860f45f29416994 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Wed, 2 Jan 2019 14:01:52 -0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Patch=20gcc-7-base=20manually,=20desi?= =?UTF-8?q?red=20version=20isn=E2=80=99t=20in=20the=20apt=20repo"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8979bef9c4987d57874138900bbb0a080ee48604. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ebf9b596..b0b62d186 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ addons: - libglib2.0-dev - libxml2-dev - uuid-dev + - gcc-7-base=7.3.0-21ubuntu1 branches: only: @@ -68,8 +69,6 @@ matrix: env: CC=clang CXX=clang++ SIGN_BUILD=true before_install: -# Patch gcc-7-base -- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y --force-yes -q -qq dpkg; wget http://launchpadlibrarian.net/386851587/gcc-7-base_7.3.0-29ubuntu1_amd64.deb; sudo dpkg -i ./gcc-7-base_7.3.0-29ubuntu1_amd64.deb; fi # Decrypt and uncompress code signing certs, etc. - openssl aes-256-cbc -K $encrypted_faf2708e46e2_key -iv $encrypted_faf2708e46e2_iv -in app/build/resources/certs.tar.enc -out app/build/resources/certs.tar -d;