workflow: Update Ubuntu version to 20.04

This commit is contained in:
rdb 2023-02-07 17:32:07 +01:00
parent d8838fd7ed
commit 33f6ea73a2

View File

@ -20,7 +20,7 @@ jobs:
include: include:
- profile: ubuntu-bionic-standard-unity-makefile - profile: ubuntu-bionic-standard-unity-makefile
os: ubuntu-18.04 os: ubuntu-20.04
config: Standard config: Standard
unity: YES unity: YES
generator: Unix Makefiles generator: Unix Makefiles
@ -30,7 +30,7 @@ jobs:
eigen: NO eigen: NO
- profile: ubuntu-bionic-coverage-ninja - profile: ubuntu-bionic-coverage-ninja
os: ubuntu-18.04 os: ubuntu-20.04
config: Coverage config: Coverage
unity: NO unity: NO
generator: Ninja generator: Ninja
@ -115,10 +115,6 @@ jobs:
libxcursor-dev libxrandr-dev nvidia-cg-toolkit zlib1g-dev libxcursor-dev libxrandr-dev nvidia-cg-toolkit zlib1g-dev
python3-setuptools python3-setuptools
# Workaround for CMake 3.12 finding this first:
sudo rm /usr/bin/x86_64-linux-gnu-python2.7-config
- name: Cache dependencies (Windows) - name: Cache dependencies (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'
uses: actions/cache@v1 uses: actions/cache@v1
@ -365,12 +361,12 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')" if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04, windows-2019, macOS-11] os: [ubuntu-20.04, windows-2019, macOS-11]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install dependencies (Ubuntu) - name: Install dependencies (Ubuntu)
if: matrix.os == 'ubuntu-18.04' if: matrix.os == 'ubuntu-20.04'
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install build-essential bison flex libfreetype6-dev libgl1-mesa-dev libjpeg-dev libode-dev libopenal-dev libpng-dev libssl-dev libvorbis-dev libx11-dev libxcursor-dev libxrandr-dev nvidia-cg-toolkit zlib1g-dev sudo apt-get install build-essential bison flex libfreetype6-dev libgl1-mesa-dev libjpeg-dev libode-dev libopenal-dev libpng-dev libssl-dev libvorbis-dev libx11-dev libxcursor-dev libxrandr-dev nvidia-cg-toolkit zlib1g-dev