Skip to content

Commit 24e7a4f

Browse files
veloman-yunkanveloman-yunkan
committed
Added OS_NAME in build definition table for focal
Next we are going to have some CI/CD jobs running on jammy instead of focal that's why the build platform for Linux jobs has to be made explicit.
1 parent 0217628 commit 24e7a4f

File tree

2 files changed

+26
-25
lines changed

2 files changed

+26
-25
lines changed

‎.github/scripts/build_definition.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,32 @@
3838
| macos | macOS_x86_64 | B | B | | | | | |
3939
| macos | apple_all_static | | BP | | | | xcframework | |
4040
----------------------------------------------------------------------------------------------------------------------------------------------
41-
| | flatpak | | | | | BP | | |
42-
| | native_static | d | d | dBPSD | dBPSD | | linux-x86_64 | linux-x86_64-static |
43-
| | native_mixed | BPS | BPS | | | | linux-x86_64 | |
44-
| | native_dyn | d | d | dB | dB | dBPS | | linux-x86_64-dyn |
41+
| focal | flatpak | | | | | BP | | |
42+
| focal | native_static | d | d | dBPSD | dBPSD | | linux-x86_64 | linux-x86_64-static |
43+
| focal | native_mixed | BPS | BPS | | | | linux-x86_64 | |
44+
| focal | native_dyn | d | d | dB | dB | dBPS | | linux-x86_64-dyn |
4545
# libzim CI is building alpine_dyn but not us
46-
| | android_arm | dBP | dBP | | | | android-arm | android-arm |
47-
| | android_arm64 | dBP | dBP | | | | android-arm64 | android-arm64 |
48-
| | android_x86 | BP | BP | | | | android-x86 | |
49-
| | android_x86_64 | BP | BP | | | | android-x86_64 | |
50-
| | armv6_static | | | BP | BP | | linux-armv6 | |
51-
| | armv6_mixed | BP | | | | | linux-armv6 | |
52-
| | armv6_dyn | | | B | B | | | |
53-
| | armv8_static | | | BP | BP | | linux-armv8 | |
54-
| | armv8_mixed | BP | | | | | linux-armv8 | |
55-
| | armv8_dyn | | | B | B | | | |
56-
| | aarch64_static | | | BP | BP | | linux-aarch64 | |
57-
| | aarch64_mixed | BP | | | | | linux-aarch64 | |
58-
| | aarch64_dyn | d | | B | B | | | linux-aarch64-dyn |
59-
| | aarch64_musl_static| | | BP | BP | | linux-aarch64-musl | |
60-
| | aarch64_musl_mixed | BP | | | | | linux-aarch64-musl | |
61-
| | aarch64_musl_dyn | d | | B | B | | | linux-aarch64-musl-dyn |
62-
| | x86-64_musl_static | | | BP | BP | | linux-x86_64-musl | |
63-
| | x86-64_musl_mixed | BP | | | | | linux-x86_64-musl | |
64-
| | i586_static | | | BP | BP | | linux-i586 | |
65-
| | i586_dyn | | | B | B | | | |
66-
| | wasm | dBP | | | | | wasm-emscripten | wasm |
46+
| focal | android_arm | dBP | dBP | | | | android-arm | android-arm |
47+
| focal | android_arm64 | dBP | dBP | | | | android-arm64 | android-arm64 |
48+
| focal | android_x86 | BP | BP | | | | android-x86 | |
49+
| focal | android_x86_64 | BP | BP | | | | android-x86_64 | |
50+
| focal | armv6_static | | | BP | BP | | linux-armv6 | |
51+
| focal | armv6_mixed | BP | | | | | linux-armv6 | |
52+
| focal | armv6_dyn | | | B | B | | | |
53+
| focal | armv8_static | | | BP | BP | | linux-armv8 | |
54+
| focal | armv8_mixed | BP | | | | | linux-armv8 | |
55+
| focal | armv8_dyn | | | B | B | | | |
56+
| focal | aarch64_static | | | BP | BP | | linux-aarch64 | |
57+
| focal | aarch64_mixed | BP | | | | | linux-aarch64 | |
58+
| focal | aarch64_dyn | d | | B | B | | | linux-aarch64-dyn |
59+
| focal | aarch64_musl_static| | | BP | BP | | linux-aarch64-musl | |
60+
| focal | aarch64_musl_mixed | BP | | | | | linux-aarch64-musl | |
61+
| focal | aarch64_musl_dyn | d | | B | B | | | linux-aarch64-musl-dyn |
62+
| focal | x86-64_musl_static | | | BP | BP | | linux-x86_64-musl | |
63+
| focal | x86-64_musl_mixed | BP | | | | | linux-x86_64-musl | |
64+
| focal | i586_static | | | BP | BP | | linux-i586 | |
65+
| focal | i586_dyn | | | B | B | | | |
66+
| focal | wasm | dBP | | | | | wasm-emscripten | wasm |
6767
"""
6868

6969

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
env:
111111
HOME: /home/runner
112112
SSH_KEY: /tmp/id_rsa
113+
OS_NAME: ${{matrix.image_variant}}
113114
runs-on: ubuntu-22.04
114115
container:
115116
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-06-03"

0 commit comments

Comments
 (0)