Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dont use bitcode as it's now deprecated #839

Merged
merged 6 commits into from
Nov 11, 2023
Merged

Dont use bitcode as it's now deprecated #839

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7a576e
Dont use bitcode as it's now deprecated
rgaudin Nov 7, 2023
5b85779
fixed deps filename on tmp.kiwix.org/ci
rgaudin Nov 8, 2023
6b18ea7
remove macos-11: not a runing nor building target anymore
rgaudin Nov 8, 2023
b0462c8
use latest meson (as we do on other projects)
rgaudin Nov 8, 2023
1e2780d
restoring iOS builds as its been fixed
rgaudin Nov 10, 2023
cdc840b
removed macos12 from CI
rgaudin Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 3 additions & 24 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,11 @@ jobs:
fail-fast: false
matrix:
os:
- macos-11
- 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-11
target: iOS_arm64
- os: macos-11
target: iOS_x86_64
- os: macos-13-xlarge
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 }}

steps:
Expand All @@ -55,12 +34,12 @@ 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
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
Expand All @@ -69,7 +48,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
Expand Down
Loading