Browse Source

[1.5] Fix CI building (#7937)

* [1.5] Update libzt

This backports 72a518bcf7 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
pull/7998/head
Oleksandr Kalko 11 months ago committed by GitHub
parent
commit
976319698e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      .github/workflows/Linux_aarch64.yml
  2. 5
      .github/workflows/Linux_x86.yml
  3. 2
      .github/workflows/Linux_x86_64.yml
  4. 2
      3rdParty/libzt/CMakeLists.txt

5
.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

5
.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

2
.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

2
3rdParty/libzt/CMakeLists.txt vendored

@ -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)

Loading…
Cancel
Save