From d7a576e3ac18b23464691d5f6ee29d88ea627233 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Tue, 7 Nov 2023 16:34:52 +0000 Subject: [PATCH 1/6] Dont use bitcode as it's now deprecated See https://stackoverflow.com/questions/72543728/xcode-14-deprecates-bitcode-but-why --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30ee81359..9f5d8daa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: MESON_OPTION="--default-library=shared" MESON_CROSSFILE="$HOME/BUILD_${{matrix.target}}/meson_cross_file.txt" if [[ ! "${{matrix.target}}" =~ native_.* ]]; then - MESON_OPTION="$MESON_OPTION -Db_bitcode=true --cross-file $MESON_CROSSFILE -Dstatic-linkage=true" + MESON_OPTION="$MESON_OPTION --cross-file $MESON_CROSSFILE -Dstatic-linkage=true" cat $MESON_CROSSFILE fi export PKG_CONFIG_PATH=$HOME/BUILD_${{matrix.target}}/INSTALL/lib/pkgconfig From 5b8577961a8b64f17b83385a0e1f3422ab928177 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Wed, 8 Nov 2023 07:47:54 +0000 Subject: [PATCH 2/6] fixed deps filename on tmp.kiwix.org/ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f5d8daa7..713670785 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: - name: Install deps shell: bash run: | - ARCHIVE_NAME=deps2_osx_${{matrix.target}}_libzim.tar.xz + ARCHIVE_NAME=deps2_macos_${{matrix.target}}_libzim.tar.xz wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C $HOME - name: Compile From 6b18ea7ce112b7d110427fd489ee926c51e15975 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Wed, 8 Nov 2023 08:16:30 +0000 Subject: [PATCH 3/6] remove macos-11: not a runing nor building target anymore --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 713670785..7ea9a3d56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,6 @@ jobs: fail-fast: false matrix: os: - - macos-11 - macos-12 - macos-13 - macos-13-xlarge @@ -22,10 +21,6 @@ jobs: - iOS_x86_64 exclude: # iOS cross-compilation only on the 2 latest versions of macOS x86_64 - - os: macos-11 - target: iOS_arm64 - - os: macos-11 - target: iOS_x86_64 - os: macos-13-xlarge target: iOS_arm64 - os: macos-13-xlarge From b0462c873f870629d26be3b18b541b1a9329fb61 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Wed, 8 Nov 2023 08:32:13 +0000 Subject: [PATCH 4/6] use latest meson (as we do on other projects) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ea9a3d56..473100693 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: brew install gcovr pkg-config ninja || brew link --overwrite python - name: Install python modules - run: pip3 install meson==0.52.1 pytest + run: pip3 install meson pytest - name: Install deps shell: bash From 1e2780d46d8659b9aa191a8385d5b43e8ae8a02c Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Fri, 10 Nov 2023 12:35:23 +0000 Subject: [PATCH 5/6] restoring iOS builds as its been fixed --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 473100693..bffce23d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,12 +25,6 @@ jobs: target: iOS_arm64 - os: macos-13-xlarge target: iOS_x86_64 - # TODO: iOS cross-compilation on macOS 13 compilation has to be fixed - # https://github.com/openzim/libzim/issues/834 - - os: macos-13 - target: iOS_arm64 - - os: macos-13 - target: iOS_x86_64 # TODO: M1 runner is still in beta and not reliable - os: macos-13-xlarge runs-on: ${{ matrix.os }} From cdc840b486b154ee29b8f63551d38eb357865e95 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Sat, 11 Nov 2023 17:20:00 +0000 Subject: [PATCH 6/6] removed macos12 from CI We use kiwix-build deps which are compiled with (and instruct to build with) Xcode 15 which is not available on macOS12 https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode Also removed macos13-xlarge (apple silicon) as it's completly excluded ; so it's simpler --- .github/workflows/ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bffce23d3..994e6d9f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,21 +12,11 @@ jobs: fail-fast: false matrix: os: - - macos-12 - macos-13 - - macos-13-xlarge target: - native_dyn - iOS_arm64 - iOS_x86_64 - exclude: - # iOS cross-compilation only on the 2 latest versions of macOS x86_64 - - os: macos-13-xlarge - target: iOS_arm64 - - os: macos-13-xlarge - target: iOS_x86_64 - # TODO: M1 runner is still in beta and not reliable - - os: macos-13-xlarge runs-on: ${{ matrix.os }} steps: