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

fix: unbreak iOS CI build and enable x86 Android targets #14

Merged
merged 12 commits into from
Dec 19, 2024
Merged

fix: unbreak iOS CI build and enable x86 Android targets #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1b50af6
Update build.gradle
olliiiver Dec 9, 2024
96d46d4
Merge branch 'unomed-dev:main' into main
olliiiver Dec 13, 2024
111e0ea
Update macOS version
olliiiver Dec 13, 2024
a446167
Adding x86
olliiiver Dec 13, 2024
108211e
Adding i686-linux-android
olliiiver Dec 13, 2024
976363a
use arm64 for build
olliiiver Dec 13, 2024
c41fa1b
Merge branch 'main' into x86
olliiiver Dec 13, 2024
1cfa98e
added export CARGO_FEATURE_NO_NEON=1 to ios.yml
olliiiver Dec 17, 2024
deb2b92
Revert build.gradle
olliiiver Dec 17, 2024
b49960a
added comment
olliiiver Dec 17, 2024
1754fbb
Update .github/workflows/android.yml
Johennes Dec 18, 2024
d0c4ffd
Update ubrn.yaml
Johennes Dec 18, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Rust
uses: dtolnay/rust-toolchain@stable
with:
targets: aarch64-linux-android,armv7-linux-androideabi
targets: aarch64-linux-android,armv7-linux-androideabi,i686-linux-android,x86_64-linux-android

- name: Install cargo-ndk
run: cargo install cargo-ndk
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:

- name: Generate
run: |
# Disabling NEON fixes linker error, see
# https://github.com/unomed-dev/react-native-matrix-sdk/issues/12
export CARGO_FEATURE_NO_NEON=1
Copy link
Collaborator

Choose a reason for hiding this comment

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

This comment made me think that we should probably force the reldbg profile during building instead. However, uniffi-bindgen-react-native only supports release and debug right now. So I think this is fine for now.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Have logged jhugman/uniffi-bindgen-react-native#190 upstream to allow specifying the profile in future.

yarn ubrn:clean
yarn ubrn:checkout
yarn ubrn:ios
Expand Down
2 changes: 2 additions & 0 deletions ubrn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ android:
targets:
- arm64-v8a
- armeabi-v7a
- x86
Johennes marked this conversation as resolved.
Show resolved Hide resolved
- x86_64
ios:
cargoExtras: []
directory: ios
Expand Down
Loading