From 6cbfbf8aad9f417d283007df17dcd406edd92856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Wed, 12 Feb 2025 15:18:01 +0100 Subject: [PATCH] Bump ubuntu images & runners to 22.04 While this may mean the binaries produced will no longer be compatible with some unix installations with older glibc versions present, GitHub are pulling support for the `ubuntu-20.04` runner on April 1, so we don't really have much of a say in this matter. The docker image tags could possibly stay for a while longer, but the whole reason why GitHub are pulling the 20.04 runners is that the LTS period for Ubuntu 20.04 *also* ends on April 1, so maybe best to just get it out of the way all across the board. --- .github/workflows/build.yml | 10 +++++----- External/build.sh | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f91fbd..3a3372a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,10 +17,10 @@ jobs: - { name: win-x64, os: windows-latest, flags: -A x64 } - { name: win-x86, os: windows-latest, flags: -A Win32 } - { name: win-arm64, os: windows-latest, flags: -A ARM64 } - - { name: linux-x64, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":amd64" } - - { name: linux-x86, os: ubuntu-20.04, flags: -GNinja -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32", target_apt_arch: ":i386" } - - { name: linux-arm64, os: ubuntu-22.04-arm, flags: -GNinja, target_apt_arch: ":arm64", container: "arm64v8/ubuntu:20.04" } - - { name: linux-arm, os: ubuntu-22.04-arm, flags: -GNinja, target_apt_arch: ":armhf", container: "arm32v7/ubuntu:20.04" } + - { name: linux-x64, os: ubuntu-22.04, flags: -GNinja, target_apt_arch: ":amd64" } + - { name: linux-x86, os: ubuntu-22.04, flags: -GNinja -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32", target_apt_arch: ":i386" } + - { name: linux-arm64, os: ubuntu-22.04-arm, flags: -GNinja, target_apt_arch: ":arm64", container: "arm64v8/ubuntu:22.04" } + - { name: linux-arm, os: ubuntu-22.04-arm, flags: -GNinja, target_apt_arch: ":armhf", container: "arm32v7/ubuntu:22.04" } - { name: osx-x64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 } # NOTE: macOS 11.0 is the first released supported by Apple Silicon. - { name: osx-arm64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 } @@ -112,7 +112,7 @@ jobs: build-android: name: android - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: NDK_VER: 23.1.7779620 PLATFORM_VER: android-34 diff --git a/External/build.sh b/External/build.sh index 637476d..44e5498 100755 --- a/External/build.sh +++ b/External/build.sh @@ -22,11 +22,6 @@ if [[ $RUNNER_OS == 'Linux' ]]; then $SUDO apt-get update -y -qq - if [[ $TARGET_APT_ARCH == :i386 ]]; then - # Workaround GitHub's ubuntu-20.04 image issue - $SUDO apt-get install -y --allow-downgrades libpcre2-8-0=10.34-7 - fi - if [[ $NAME != 'linux-x86' && $NAME != 'linux-x64' ]]; then GCC="gcc" GPP="g++"