Travis fix attempt

brick · Dec 3, 2019 · 8fa1abd · 8fa1abd
1 parent bc664bd
commit 8fa1abd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,4 @@
 language: php
-dist: trusty
-sudo: required
 
 php:
   - 7.1

diff --git a/travis/install-mysql-5.7.sh b/travis/install-mysql-5.7.sh
@@ -1,3 +1,13 @@
+set -e
+
+# https://askubuntu.com/questions/1065231/dpkg-deb-error-archive-has-premature-member-control-tar-xz-before-contr
+sudo apt-get clean
+sudo apt-get update
+sudo apt-get install dpkg
+
+# https://github.com/git-lfs/git-lfs/issues/3474#issuecomment-454237261
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
+
 echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
 wget https://dev.mysql.com/get/mysql-apt-config_0.8.14-1_all.deb
 sudo dpkg --install mysql-apt-config_0.8.14-1_all.deb

diff --git a/travis/install-mysql-8.0.sh b/travis/install-mysql-8.0.sh
@@ -1,3 +1,13 @@
+set -e
+
+# https://askubuntu.com/questions/1065231/dpkg-deb-error-archive-has-premature-member-control-tar-xz-before-contr
+sudo apt-get clean
+sudo apt-get update
+sudo apt-get install dpkg
+
+# https://github.com/git-lfs/git-lfs/issues/3474#issuecomment-454237261
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
+
 echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
 wget https://dev.mysql.com/get/mysql-apt-config_0.8.14-1_all.deb
 sudo dpkg --install mysql-apt-config_0.8.14-1_all.deb