Merge pull request #813 from kiwix/commented-out-ninja-install-macos

Comment-out ninja install for macOS
2025-04-16 12:43:22 +02:00 · 2025-04-16 12:09:16 +02:00 · 2025-04-16 10:04:49 +02:00 · 2025-04-16 09:26:02 +02:00
3 changed files with 3 additions and 3 deletions
--- a/.github/scripts/build_definition.py
+++ b/.github/scripts/build_definition.py
@ -42,7 +42,7 @@ BUILD_DEF = """
    | focal     | native_static      | d      | d        | dBPSD     | dBPSD       |               | linux-x86_64            | linux-x86_64-static    |
    | focal     | native_mixed       | BPS    | BPS      |           |             |               | linux-x86_64            |                        |
    | focal     | native_dyn         | d      | d        | dB        | dB          |               |                         | linux-x86_64-dyn       |
-    | jammy     | native_dyn         | d      | d        |           |             | dBPS          |                         | linux-x86_64-dyn       |
+    | jammy     | native_dyn         |        |          |           |             | dBPS          |                         | linux-x86_64-dyn       |
    # libzim CI is building alpine_dyn but not us
    | focal     | android_arm        | dBP    | dBP      |           |             |               | android-arm             | android-arm            |
    | focal     | android_arm64      | dBP    | dBP      |           |             |               | android-arm64           | android-arm64          |
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@ -251,7 +251,7 @@ jobs:
        python-version: '3.10'
    - name: Install packages
      run:
-        brew install ninja automake
+        brew install automake # ninja
    - name: Install python modules
      run: |
        pip3 install meson pytest requests distro
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -239,7 +239,7 @@ jobs:
        python-version: '3.10'
    - name: Install packages
      run:
-        brew install ninja automake
+        brew install automake # ninja
    - name: Install python modules
      run: |
        pip3 install meson pytest requests distro paramiko
Author	SHA1	Message	Date
Kelson	77592b12ff	Merge pull request #813 from kiwix/commented-out-ninja-install-macos Comment-out ninja install for macOS	2025-04-16 12:43:22 +02:00
Emmanuel Engelhart	e67295a3d0	Comment-out ninja install for macOS	2025-04-16 12:09:16 +02:00
Kelson	8780b994a3	Merge pull request #811 from kiwix/no-double-native-archives Dont publish built dependencies on jammy to prevent double archives	2025-04-16 10:04:49 +02:00
rgaudin	f888c87459	Issue #770 : Dont publish built dependencies on jammy to prevent double archives Currently, both jammy and focal publish the native_dyn versions of dependencies for libzim and libkiwix. This creates concurrent upload issues. This removes this step for jammy so it gets uploaded only once.	2025-04-16 09:26:02 +02:00