Skip to content

Commit 699cbcc

Browse files
authored
Merge pull request #1209 from kiwix/focal-to-jammy-ci
Use Ubuntu 22.04 in place of 20.04 for CI
2 parents 6225b46 + fdc3a71 commit 699cbcc

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os:
15-
- macos-13
15+
- macos-14
1616
target:
1717
- macos-x86_64-dyn
1818
- ios-arm64-dyn
@@ -121,27 +121,24 @@ jobs:
121121
- linux-x86_64-dyn
122122
- android-arm
123123
- android-arm64
124+
image_variant: ['jammy']
124125
include:
125126
- target: linux-x86_64-static
126-
image_variant: focal
127127
lib_postfix: '/x86_64-linux-gnu'
128128
arch_name: linux-x86_64
129129
run_test: true
130130
coverage: true
131131
- target: linux-x86_64-dyn
132-
image_variant: focal
133132
lib_postfix: '/x86_64-linux-gnu'
134133
arch_name: linux-x86_64
135134
run_test: true
136135
coverage: true
137136
- target: android-arm
138-
image_variant: focal
139137
lib_postfix: '/arm-linux-androideabi'
140138
arch_name: arm-linux-androideabi
141139
run_test: false
142140
coverage: false
143141
- target: android-arm64
144-
image_variant: focal
145142
lib_postfix: '/aarch64-linux-android'
146143
arch_name: aarch64-linux-android
147144
run_test: false
@@ -150,7 +147,7 @@ jobs:
150147
HOME: /home/runner
151148
runs-on: ubuntu-22.04
152149
container:
153-
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38"
150+
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2025-06-07"
154151
steps:
155152
- name: Checkout code
156153
uses: actions/checkout@v4

0 commit comments

Comments
 (0)