Merge pull request #1209 from kiwix/focal-to-jammy-ci

Use Ubuntu 22.04 in place of 20.04 for CI
This commit is contained in:
Kelson 2025-06-22 20:54:17 +02:00 committed by GitHub
commit 699cbccf38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -12,7 +12,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- macos-13 - macos-14
target: target:
- macos-x86_64-dyn - macos-x86_64-dyn
- ios-arm64-dyn - ios-arm64-dyn
@ -121,27 +121,24 @@ jobs:
- linux-x86_64-dyn - linux-x86_64-dyn
- android-arm - android-arm
- android-arm64 - android-arm64
image_variant: ['jammy']
include: include:
- target: linux-x86_64-static - target: linux-x86_64-static
image_variant: focal
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
arch_name: linux-x86_64 arch_name: linux-x86_64
run_test: true run_test: true
coverage: true coverage: true
- target: linux-x86_64-dyn - target: linux-x86_64-dyn
image_variant: focal
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
arch_name: linux-x86_64 arch_name: linux-x86_64
run_test: true run_test: true
coverage: true coverage: true
- target: android-arm - target: android-arm
image_variant: focal
lib_postfix: '/arm-linux-androideabi' lib_postfix: '/arm-linux-androideabi'
arch_name: arm-linux-androideabi arch_name: arm-linux-androideabi
run_test: false run_test: false
coverage: false coverage: false
- target: android-arm64 - target: android-arm64
image_variant: focal
lib_postfix: '/aarch64-linux-android' lib_postfix: '/aarch64-linux-android'
arch_name: aarch64-linux-android arch_name: aarch64-linux-android
run_test: false run_test: false
@ -150,7 +147,7 @@ jobs:
HOME: /home/runner HOME: /home/runner
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
container: container:
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38" image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2025-06-07"
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4