mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-08 19:23:28 +02:00
Merge pull request #164 from JulianGro/gha_ubuntu20.04
Update GitHub Actions to Ubuntu 20.04
This commit is contained in:
commit
dd871de03f
2 changed files with 5 additions and 3 deletions
3
.github/workflows/master_build.yml
vendored
3
.github/workflows/master_build.yml
vendored
|
@ -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:
|
||||
|
|
5
.github/workflows/pr_build.yml
vendored
5
.github/workflows/pr_build.yml
vendored
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue