From: Martin Matuška <martin@matuska.org>
Date: Sat, 12 Oct 2024 16:31:20 +0000 (+0200)
Subject: CI: Update build environments (#2373)
X-Git-Tag: v3.8.0~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ce80b970de61a59e2f0753c09ecf283d7ee339;p=thirdparty%2Flibarchive.git

CI: Update build environments (#2373)

FreeBSD 13.3 -> 13.4
FreeBSD 14.0 -> 14.1
Ubuntu 22.04 -> 24.04
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 02ea6fabb..fe543e258 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -10,9 +10,9 @@ FreeBSD_task:
       BS: cmake
   matrix:
     freebsd_instance:
-      image_family: freebsd-14-0
+      image_family: freebsd-14-1
     freebsd_instance:
-      image_family: freebsd-13-3
+      image_family: freebsd-13-4
   prepare_script:
   - ./build/ci/cirrus_ci/ci.sh prepare
   configure_script:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e6cdcaa0..ac2c85a4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
         path: libarchive.tar.xz
 
   Ubuntu:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         bs: [autotools, cmake]
@@ -96,7 +96,7 @@ jobs:
         name: libarchive-ubuntu-${{ matrix.bs }}-${{ matrix.crypto }}-${{ github.sha }}
         path: libarchive.tar.xz
   Ubuntu-distcheck:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
     - name: Update package definitions