From 5f7020f73d542e000cb641f50508e02fdbf4739c Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 22 Jun 2021 09:58:40 +0100
Subject: [PATCH] More CI tweaks

Signed-off-by: falkTX <falktx@falktx.com>
---
 .travis.yml               |  4 ++--
 .travis/before_install.sh | 26 +++++++++++++++-----------
 .travis/install.sh        |  5 +++++
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa4fccd4d..d26d8420d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: cpp
 
 os: linux
 
-dist: bionic
+dist: focal
 
 jobs:
   include:
@@ -60,4 +60,4 @@ script:
 
 notifications:
   email: true
-  irc: "ircs://chat.freenode.net:7070/#kxstudio"
+  irc: "ircs://chat.libera.chat:7070/#kxstudio"
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 3b88ed9f6..cb998e30b 100644
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -2,23 +2,27 @@
 
 set -e
 
+if [ "${TARGET}" = "macos-native" ] || [ "${TARGET}" = "macos-universal" ]; then
+    exit 0
+fi
+
 if [ "${TARGET}" = "macos" ]; then
     rm -f /etc/apt/sources.list.d/*.list
+    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
+    sudo apt-get update -qq
+    sudo apt-get install kxstudio-repos
+    sudo apt-get update -qq
+    exit 0
 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" ]; then
+if [ "${TARGET}" = "linux" ] || [ "${TARGET}" = "win32" ] || [ "${TARGET}" = "win64" ]; then
     wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
-    sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main'
-    sudo add-apt-repository -y ppa:kxstudio-debian/ubuntus
+    sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
     sudo dpkg --add-architecture i386
-elif [ "${TARGET}" = "linux-strict" ] || [ "${TARGET}" = "linux-juce-strict" ]; then
-    sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 fi
 
 sudo apt-get update -qq
-sudo apt-get install kxstudio-repos
-sudo apt-get update -qq
+sudo apt-get install -y -o APT::Immediate-Configure=false libc6 libc6:i386 libgcc-s1:i386
+sudo apt-get install -y -f
diff --git a/.travis/install.sh b/.travis/install.sh
index f502d5a36..0139d4bd0 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -91,6 +91,11 @@ elif [ "${TARGET}" = "macos" ]; then
         pkg-config \
         apple-x86-setup
 
+elif [ "${TARGET}" = "macos-native" ] || [ "${TARGET}" = "macos-universal" ]; then
+    HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake jq meson
+    exit 0
+fi
+
 elif [ "${TARGET}" = "win32" ]; then
     sudo apt-get install -y \
         g++-multilib \