ubuntu20.04

This commit is contained in:
Martin Rotter 2023-04-05 07:57:25 +02:00
parent 9de62b46ed
commit 67a5469120
2 changed files with 5 additions and 5 deletions

View File

@ -29,18 +29,18 @@ jobs:
runs-on: "${{ matrix.os }}"
strategy:
matrix:
os: [windows-2019, ubuntu-18.04, macos-10.15]
os: [windows-2019, ubuntu-20.04, macos-10.15]
use_webengine: ["ON", "OFF"]
use_qt5: ["ON", "OFF"]
include:
- os: windows-2019
script_name: .\resources\scripts\github-actions\build-windows.ps1
- os: ubuntu-18.04
- os: ubuntu-20.04
script_name: ./resources/scripts/github-actions/build-linux-mac.sh
- os: macos-10.15
script_name: ./resources/scripts/github-actions/build-linux-mac.sh
exclude:
- os: ubuntu-18.04
- os: ubuntu-20.04
use_qt5: "OFF"
- os: macos-10.15
use_qt5: "ON"

View File

@ -31,11 +31,11 @@ if [ $is_linux = true ]; then
QTARCH="gcc_64"
USE_QT6="OFF"
sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic -y
sudo add-apt-repository ppa:beineri/opt-qt-5.15.4-focal -y
sudo apt-get update
sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats
sudo apt-get -qy install cmake ninja-build openssl libssl-dev libgl1-mesa-dev gstreamer1.0-alsa gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-qt5 gstreamer1.0-pulseaudio
sudo apt-get -qy install cmake ninja-build openssl libssl-dev libgl1-mesa-dev gstreamer1.0-alsa gstreamer1.0-nice gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-qt5 gstreamer1.0-pulseaudio
# The script below performs some broken testing, which ends up tripping 'set -e'.
# So we temporarily ignore errors when sourcing the script, and re-enable them afterward.