From f82673160141046e9038883e293c0c30b681ccf5 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 25 Jul 2020 16:00:20 +0100
Subject: [PATCH] More CI tweaks

Signed-off-by: falkTX <falktx@falktx.com>
---
 .travis.yml                         | 2 +-
 .travis/before_install.sh           | 9 +++++++--
 .travis/install.sh                  | 7 +++----
 .travis/script-linux-juce-strict.sh | 4 ++--
 .travis/script-linux-strict.sh      | 4 ++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 506580144..8bde31259 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: cpp
 
 os: linux
 
-dist: focal
+dist: bionic
 
 jobs:
   include:
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 1dc73ca75..daa275a4b 100644
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -2,12 +2,17 @@
 
 set -e
 
+if [ "${TARGET}" = "win32" ]; then
+    sudo dpkg --add-architecture i386
+fi
+
 sudo add-apt-repository -y ppa:kxstudio-debian/kxstudio
 sudo add-apt-repository -y ppa:kxstudio-debian/mingw
 sudo add-apt-repository -y ppa:kxstudio-debian/toolchain
 
-if [ "${TARGET}" = "linux-strict" ] || [ "${TARGET}" = "linux-juce-strict" ]; then
-  sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+if [ "${TARGET}" = "win32" ] || [ "${TARGET}" = "win64" ]; then
+    wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
+    sudo apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main'
 fi
 
 sudo apt-get update -qq
diff --git a/.travis/install.sh b/.travis/install.sh
index cbe67fdd2..1c353251f 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -26,8 +26,7 @@ if [ "${TARGET}" = "linux" ]; then
         binutils-mingw-w64-x86-64 \
         g++-mingw-w64-i686 \
         g++-mingw-w64-x86-64 \
-        wine-stable \
-        wine-stable-dev
+        wine-stable
 
     # Fix for 32bit bridge link
     sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
@@ -35,7 +34,7 @@ if [ "${TARGET}" = "linux" ]; then
 elif [ "${TARGET}" = "linux-strict" ]; then
     sudo apt-get install -y \
         g++-multilib \
-        g++-10-multilib \
+        g++-9-multilib \
         pkg-config \
         pyqt5-dev-tools \
         python3-pyqt5.qtsvg \
@@ -59,7 +58,7 @@ elif [ "${TARGET}" = "linux-strict" ]; then
 elif [ "${TARGET}" = "linux-juce-strict" ]; then
     sudo apt-get install -y \
         g++-multilib \
-        g++-10-multilib \
+        g++-9-multilib \
         pkg-config \
         pyqt5-dev-tools \
         python3-pyqt5.qtsvg \
diff --git a/.travis/script-linux-juce-strict.sh b/.travis/script-linux-juce-strict.sh
index 6328803e5..73a3e9986 100755
--- a/.travis/script-linux-juce-strict.sh
+++ b/.travis/script-linux-juce-strict.sh
@@ -3,8 +3,8 @@
 set -e
 
 # Preparation
-export CC=gcc-10
-export CXX=g++-10
+export CC=gcc-9
+export CXX=g++-9
 export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig:${PKG_CONFIG_PATH}
 unset CFLAGS
 unset CXXFLAGS
diff --git a/.travis/script-linux-strict.sh b/.travis/script-linux-strict.sh
index 774b2ba4b..c33805451 100755
--- a/.travis/script-linux-strict.sh
+++ b/.travis/script-linux-strict.sh
@@ -3,8 +3,8 @@
 set -e
 
 # Preparation
-export CC=gcc-10
-export CXX=g++-10
+export CC=gcc-9
+export CXX=g++-9
 export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig:${PKG_CONFIG_PATH}
 unset CFLAGS
 unset CXXFLAGS