From aea500fef6815ddfb19e49b5a0910c0c39fd2a5e Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 22 Jun 2021 12:19:24 +0100
Subject: [PATCH] Move CI to focal

Signed-off-by: falkTX <falktx@falktx.com>
---
 .travis.yml               | 6 +++---
 .travis/before_install.sh | 9 ++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1fa6c2d9..386ceb76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ jobs:
   - name: "Linux native"
     os: linux
     compiler: gcc
-    dist: bionic
+    dist: focal
     env:
       - TARGET="linux"
     services:
@@ -18,7 +18,7 @@ jobs:
   #- name: "win32 cross-compilation"
     #os: linux
     #compiler: gcc
-    #dist: bionic
+    #dist: focal
     #env:
       #- TARGET="win32"
     #services:
@@ -29,7 +29,7 @@ jobs:
   #- name: "win64 cross-compilation"
     #os: linux
     #compiler: gcc
-    #dist: bionic
+    #dist: focal
     #env:
       #- TARGET="win32"
     #services:
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 78bd7611..93e5da90 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -13,11 +13,6 @@ if [ "${TARGET}" = "win32" ] || [ "${TARGET}" = "win64" ]; 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
-sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-
-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