From 976319698e84fed91d45bf16a431d95135b830b6 Mon Sep 17 00:00:00 2001 From: Oleksandr Kalko Date: Sat, 19 Apr 2025 17:52:17 +0300 Subject: [PATCH] [1.5] Fix CI building (#7937) * [1.5] Update libzt This backports https://github.com/diasurgical/libzt/commit/72a518bcf7d87e32f718ca612ce2c8303ceedd12 since CI updated CMake to 4.0 and CMake 3.5 compatibility was removed * Upgrade Linux runners to Ubuntu 22.04 Ubuntu 20.04 was retired April 15th 2025 * Remove obsolete workaround --- .github/workflows/Linux_aarch64.yml | 5 +---- .github/workflows/Linux_x86.yml | 5 +---- .github/workflows/Linux_x86_64.yml | 2 +- 3rdParty/libzt/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Linux_aarch64.yml b/.github/workflows/Linux_aarch64.yml index 88fc823cc..a1e718765 100644 --- a/.github/workflows/Linux_aarch64.yml +++ b/.github/workflows/Linux_aarch64.yml @@ -22,7 +22,7 @@ concurrency: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 @@ -31,9 +31,6 @@ jobs: - name: Create Build Environment run: | - # Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image. - # https://github.com/actions/runner-images/issues/4620#issuecomment-981333260 - sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7 Packaging/nix/debian-cross-aarch64-prep.sh - name: Cache CMake build folder diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml index bd764df3c..461166889 100644 --- a/.github/workflows/Linux_x86.yml +++ b/.github/workflows/Linux_x86.yml @@ -22,7 +22,7 @@ concurrency: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 @@ -31,9 +31,6 @@ jobs: - name: Create Build Environment run: | - # Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image. - # https://github.com/actions/runner-images/issues/4620#issuecomment-981333260 - sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7 Packaging/nix/debian-cross-i386-prep.sh - name: Cache CMake build folder diff --git a/.github/workflows/Linux_x86_64.yml b/.github/workflows/Linux_x86_64.yml index 33ad6bec8..2c8da4b4c 100644 --- a/.github/workflows/Linux_x86_64.yml +++ b/.github/workflows/Linux_x86_64.yml @@ -22,7 +22,7 @@ concurrency: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt index e3feb8cd3..49ace5b58 100644 --- a/3rdParty/libzt/CMakeLists.txt +++ b/3rdParty/libzt/CMakeLists.txt @@ -5,7 +5,7 @@ set(BUILD_HOST_SELFTEST OFF) include(FetchContent) FetchContent_Declare(libzt GIT_REPOSITORY https://github.com/diasurgical/libzt.git - GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8) + GIT_TAG 72a518bcf7d87e32f718ca612ce2c8303ceedd12) FetchContent_MakeAvailableExcludeFromAll(libzt) if(NOT ANDROID)