Merge pull request #164 from JulianGro/gha_ubuntu20.04

Update GitHub Actions to Ubuntu 20.04
This commit is contained in:
Dale Glass 2022-08-20 21:32:13 +02:00 committed by GitHub
commit dd871de03f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View file

@ -38,7 +38,7 @@ jobs:
build_type: full
- os: macOS-10.15
build_type: full
- os: ubuntu-18.04
- os: ubuntu-20.04
build_type: full
apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-github python3-distro
fail-fast: false
@ -232,6 +232,7 @@ jobs:
run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
- name: Upload artifact
if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') # Automatic Linux packaging is not implemented
shell: bash
working-directory: ${{runner.workspace}}/build
env:

View file

@ -45,9 +45,9 @@ jobs:
build_type: full
- os: macOS-10.15
build_type: full
- os: ubuntu-18.04
- os: ubuntu-20.04
build_type: full
apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-distro
apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion3 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-distro
# Android builds are currently failing
#- os: ubuntu-18.04
# build_type: android
@ -322,6 +322,7 @@ jobs:
run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
- name: Upload Artifact
if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') # Automatic Linux packaging is not implemented
shell: bash
working-directory: ${{runner.workspace}}/build
env: