From 0faeea33c32b85d6bd37aab4351f66a4114ca398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:34:24 +0100 Subject: [PATCH] build.yml: Upgrade bionic/jammy -> focal (current oldest LTS) --- .github/workflows/build.yml | 47 ++++++++++++++----------------------- 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f821f5dc..7fefa400 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,16 +8,13 @@ on: jobs: linux-gl: - runs-on: ubuntu-latest - container: - image: ubuntu:bionic - env: { LANG: "C.UTF-8" } + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - name: Install deps run: | - apt-get update - apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy + sudo apt-get update + sudo apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy - name: Build run: | @@ -39,16 +36,14 @@ jobs: path: ./irrlicht-linux.tar.gz linux-gles: - runs-on: ubuntu-latest - container: - image: ubuntu:bionic - env: { LANG: "C.UTF-8" } + # Xvfb test is broken on 20.04 for unknown reasons (not our bug) + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Install deps run: | - apt-get update - apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy + sudo apt-get update + sudo apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy - name: Build run: | @@ -66,16 +61,13 @@ jobs: LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2 linux-sdl: - runs-on: ubuntu-latest - container: - image: ubuntu:jammy - env: { LANG: "C.UTF-8" } + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - name: Install deps run: | - apt-get update - apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy + sudo apt-get update + sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy - name: Build run: | @@ -88,16 +80,14 @@ jobs: ./AutomatedTest null linux-sdl-gl3: - runs-on: ubuntu-latest - container: - image: ubuntu:jammy - env: { LANG: "C.UTF-8" } + # Xvfb test is broken on 20.04 for unknown reasons (not our bug) + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Install deps run: | - apt-get update - apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy + sudo apt-get update + sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy - name: Build run: | @@ -115,16 +105,13 @@ jobs: LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest opengl3 linux-sdl-gles2: - runs-on: ubuntu-latest - container: - image: ubuntu:jammy - env: { LANG: "C.UTF-8" } + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - name: Install deps run: | - apt-get update - apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy + sudo apt-get update + sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy - name: Build run: |