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.

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

merged 6 commits into from
Nov 11, 2023

Conversation

rgaudin
Copy link
Member

@rgaudin rgaudin commented Nov 7, 2023

@rgaudin rgaudin self-assigned this Nov 7, 2023
Copy link

codecov bot commented Nov 7, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c23d43e) 57.57% compared to head (cdc840b) 57.57%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #839   +/-   ##
=======================================
  Coverage   57.57%   57.57%           
=======================================
  Files          99       99           
  Lines        4542     4542           
  Branches     1909     1909           
=======================================
  Hits         2615     2615           
  Misses        668      668           
  Partials     1259     1259           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kelson42 kelson42 added this to the 9.0.0 milestone Nov 7, 2023
Copy link
Contributor

@kelson42 kelson42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm

@kelson42
Copy link
Contributor

kelson42 commented Nov 8, 2023

@rgaudin But CI fails :(

@rgaudin
Copy link
Member Author

rgaudin commented Nov 8, 2023

OK the issue is inside the deps file that is downloaded from tmp.kiwix.org: meson_cross_file.txt includes -fembed-bitcode. I'll come back to this PR once this gets updated.

btw, those are not versioned 🤷‍♂️

@rgaudin rgaudin marked this pull request as draft November 8, 2023 08:56
@kelson42
Copy link
Contributor

kelson42 commented Nov 8, 2023

@mgautierfr We need to get something clean around this! See as well #834

@mgautierfr
Copy link
Collaborator

OK the issue is inside the deps file that is downloaded from tmp.kiwix.org: meson_cross_file.txt includes -fembed-bitcode.

The deps file is generated everynigth from kiwix-build main. As long as kiwix/kiwix-build#650 is not merged, meson_cross_file.txt will includes -fembed-bicode.

I have added a commit (to remove before merge) which use the dev_preview.

.github/workflows/ci.yml Outdated Show resolved Hide resolved
@kelson42
Copy link
Contributor

kelson42 commented Nov 9, 2023

@rgaudin @mgautierfr CI is green, so does that mean this PR is ready to merge, just blocker by merging kiwix/kiwix-build#650?

@mgautierfr
Copy link
Collaborator

On my side, mostly yes:

  • Maybe reword commits (remove the ? in upgrade meson?)
  • Remove the last commit before merging !

@rgaudin
Copy link
Member Author

rgaudin commented Nov 10, 2023

@mgautierfr do we want to introduce -mmacosx-version-min=12.0 here or do we consider that's a CD concern and that issues with this would circle-back?

I updated meson to lastest version instead as that's what we do every where.

I see you also force-pushed https://github.com/openzim/libzim/compare/44e4de62b2035f087b16443414b6f95fb0ebb72b..5dc4577ebb529228c89b013797d4bcaf34cc03ac and I don't know what to do with it.

Update the matrix as you see fit.

This could be merged D+1 after kiwix/kiwix-build#650 is merged I think

@rgaudin rgaudin marked this pull request as ready for review November 10, 2023 12:05
@mgautierfr
Copy link
Collaborator

mgautierfr commented Nov 10, 2023

I see you also force-pushed 44e4de62b2035f087b16443414b6f95fb0ebb72b..5dc4577ebb529228c89b013797d4bcaf34cc03ac (compare) and I don't know what to do with it.

This is about this discussion which is now resolved so you probably haven't seen it.

And I force push because their was another "[TOREMOVE]" commit to use the dev_preview deps archive and I wanted to keep at as the last commit of the PR.

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
@kelson42 kelson42 merged commit 14d30cf into main Nov 11, 2023
30 checks passed
@kelson42 kelson42 deleted the no-bitcode branch November 11, 2023 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failling iOS cross-compilation on macOS 13 (CI)
3 participants