[CI] Update Linux build from Ubuntu 16 to 18

Also remove workarounds for Ubuntu 16.
This commit is contained in:
Mat Sutcliffe
2021-01-07 14:26:54 +00:00
parent 14427ec39f
commit eff27c4e08

View File

@@ -67,7 +67,7 @@ jobs:
perl scripts/warnings.pl error.log perl scripts/warnings.pl error.log
buildLinux: buildLinux:
runs-on: ubuntu-16.04 runs-on: ubuntu-18.04
needs: preBuild needs: preBuild
env: env:
BACKTRACE_TOKEN: ${{ secrets.BACKTRACE_TOKEN }} BACKTRACE_TOKEN: ${{ secrets.BACKTRACE_TOKEN }}
@@ -76,17 +76,10 @@ jobs:
warnings: ${{ steps.warnings.outputs.warnings }} warnings: ${{ steps.warnings.outputs.warnings }}
steps: steps:
- name: Upgrade pip
run: |
sudo pip3 install --upgrade pip
sudo pip3 install importlib-metadata==2.0.0
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: ${{ env.qt_version }} version: ${{ env.qt_version }}
aqtversion: ==0.9.2
env:
PIP_IGNORE_REQUIRES_PYTHON: yes
- name: Download InstallBuilder - name: Download InstallBuilder
run: | run: |
wget -O ~/installbuilder.run ${{ env.bitrock_url }}/installbuilder-${{ env.bitrock_version }}-linux-x64-installer.run wget -O ~/installbuilder.run ${{ env.bitrock_url }}/installbuilder-${{ env.bitrock_version }}-linux-x64-installer.run
@@ -165,13 +158,11 @@ jobs:
with: with:
version: ${{ env.qt_version }} version: ${{ env.qt_version }}
arch: win64_msvc2019_64 arch: win64_msvc2019_64
aqtversion: ==0.9.2
- name: Install Qt debug info - name: Install Qt debug info
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: ${{ env.qt_version }} version: ${{ env.qt_version }}
arch: win64_msvc2019_64 arch: win64_msvc2019_64
aqtversion: ==0.9.2
modules: debug_info modules: debug_info
extra: --archives qtbase extra: --archives qtbase
- name: Download InstallBuilder - name: Download InstallBuilder
@@ -248,13 +239,11 @@ jobs:
with: with:
version: ${{ env.qt_version }} version: ${{ env.qt_version }}
arch: win32_msvc2019 arch: win32_msvc2019
aqtversion: ==0.9.2
- name: Install Qt debug info - name: Install Qt debug info
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: ${{ env.qt_version }} version: ${{ env.qt_version }}
arch: win32_msvc2019 arch: win32_msvc2019
aqtversion: ==0.9.2
modules: debug_info modules: debug_info
extra: --archives qtbase extra: --archives qtbase
- name: Download InstallBuilder - name: Download InstallBuilder
@@ -324,7 +313,6 @@ jobs:
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: ${{ env.qt_version }} version: ${{ env.qt_version }}
aqtversion: ==0.9.2
- name: Download InstallBuilder - name: Download InstallBuilder
run: | run: |
wget -O $HOME/installbuilder.dmg ${{ env.bitrock_url }}/installbuilder-${{ env.bitrock_version }}-osx-installer.dmg wget -O $HOME/installbuilder.dmg ${{ env.bitrock_url }}/installbuilder-${{ env.bitrock_version }}-osx-installer.dmg