Skip to content

Commit 9763196

Browse files
authored
[1.5] Fix CI building (diasurgical#7937)
* [1.5] Update libzt This backports diasurgical/libzt@72a518b 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
1 parent 3c4ba71 commit 9763196

4 files changed

Lines changed: 4 additions & 10 deletions

File tree

.github/workflows/Linux_aarch64.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222

2323
jobs:
2424
build:
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-22.04
2626
steps:
2727
- name: Checkout
2828
uses: actions/checkout@v3
@@ -31,9 +31,6 @@ jobs:
3131

3232
- name: Create Build Environment
3333
run: |
34-
# Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image.
35-
# https://github.com/actions/runner-images/issues/4620#issuecomment-981333260
36-
sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7
3734
Packaging/nix/debian-cross-aarch64-prep.sh
3835
3936
- name: Cache CMake build folder

.github/workflows/Linux_x86.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222

2323
jobs:
2424
build:
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-22.04
2626
steps:
2727
- name: Checkout
2828
uses: actions/checkout@v3
@@ -31,9 +31,6 @@ jobs:
3131

3232
- name: Create Build Environment
3333
run: |
34-
# Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image.
35-
# https://github.com/actions/runner-images/issues/4620#issuecomment-981333260
36-
sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7
3734
Packaging/nix/debian-cross-i386-prep.sh
3835
3936
- name: Cache CMake build folder

.github/workflows/Linux_x86_64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222

2323
jobs:
2424
build:
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-22.04
2626
steps:
2727
- name: Checkout
2828
uses: actions/checkout@v3

3rdParty/libzt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(BUILD_HOST_SELFTEST OFF)
55
include(FetchContent)
66
FetchContent_Declare(libzt
77
GIT_REPOSITORY https://github.com/diasurgical/libzt.git
8-
GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
8+
GIT_TAG 72a518bcf7d87e32f718ca612ce2c8303ceedd12)
99
FetchContent_MakeAvailableExcludeFromAll(libzt)
1010

1111
if(NOT ANDROID)

0 commit comments

Comments
 (0)