From 86cc4643731d246da9727463b4eaa1bcbbcd0956 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Thu, 7 Jan 2021 14:26:54 +0000
Subject: [PATCH] [CI] Update Linux build from Ubuntu 16 to 18

Also remove workarounds for Ubuntu 16.
---
 .github/workflows/build.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 350a0153a..a9c479425 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,7 +67,7 @@ jobs:
           perl scripts/warnings.pl error.log
 
   buildLinux:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     needs: preBuild
     env:
       BACKTRACE_SYMBOL_TOKEN: ${{ secrets.BACKTRACE_SYMBOL_TOKEN }}
@@ -77,17 +77,10 @@ jobs:
       warnings: ${{ steps.warnings.outputs.warnings }}
 
     steps:
-      - name: Upgrade pip
-        run: |
-          sudo pip3 install --upgrade pip
-          sudo pip3 install importlib-metadata==2.0.0
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
           version: ${{ env.qt_version }}
-          aqtversion: ==0.9.2
-        env:
-          PIP_IGNORE_REQUIRES_PYTHON: yes
       - name: Download InstallBuilder
         run: |
           wget -O ~/installbuilder.run ${{ env.bitrock_url }}/installbuilder-${{ env.bitrock_version }}-linux-x64-installer.run
@@ -167,13 +160,11 @@ jobs:
         with:
           version: ${{ env.qt_version }}
           arch: win64_msvc2019_64
-          aqtversion: ==0.9.2
       - name: Install Qt debug info
         uses: jurplel/install-qt-action@v2
         with:
           version: ${{ env.qt_version }}
           arch: win64_msvc2019_64
-          aqtversion: ==0.9.2
           modules: debug_info
           extra: --archives qtbase
       - name: Download InstallBuilder
@@ -251,13 +242,11 @@ jobs:
         with:
           version: ${{ env.qt_version }}
           arch: win32_msvc2019
-          aqtversion: ==0.9.2
       - name: Install Qt debug info
         uses: jurplel/install-qt-action@v2
         with:
           version: ${{ env.qt_version }}
           arch: win32_msvc2019
-          aqtversion: ==0.9.2
           modules: debug_info
           extra: --archives qtbase
       - name: Download InstallBuilder
@@ -328,7 +317,6 @@ jobs:
         uses: jurplel/install-qt-action@v2
         with:
           version: ${{ env.qt_version }}
-          aqtversion: ==0.9.2
       - name: Download InstallBuilder
         run: |
           wget -O $HOME/installbuilder.dmg ${{ env.bitrock_url }}/installbuilder-${{ env.bitrock_version }}-osx-installer.dmg