Skip to content

build(android): use custom cross images #189

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

Merged
berendsliedrecht merged 3 commits into from
May 25, 2023
Merged

build(android): use custom cross images #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a670cb
build(android): use custom cross images
May 25, 2023
44cdb90
Merge branch 'main' into use-custom-images
berendsliedrecht May 25, 2023
8a74d01
build(android): use custom cross images
May 25, 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
8 changes: 8 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ jobs:
build-android:
name: Build library (Android)
needs: [checks]
env:
RUST_VERSION: "1.64.0" # Overriding the rust version here for lower NDK support

runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -350,6 +353,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_VERSION }}

- name: Build
run: |
cargo install --bins --git https://github.com/rust-embedded/cross --tag v${{ env.CROSS_VERSION }} cross
Expand Down
8 changes: 4 additions & 4 deletions Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ image = "ghcr.io/rust-cross/manylinux2014-cross:aarch64"
image = "ghcr.io/rust-cross/manylinux2014-cross:x86_64"

[target.x86_64-linux-android]
image = "ghcr.io/cross-rs/x86_64-linux-android:main"
image = "ghcr.io/hyperledger/aries-builder-images/cross/x86_64-linux-android:main"

[target.i686-linux-android]
image = "ghcr.io/cross-rs/i686-linux-android:main"
image = "ghcr.io/hyperledger/aries-builder-images/cross/i686-linux-android:main"

[target.aarch64-linux-android]
image = "ghcr.io/cross-rs/aarch64-linux-android:main"
image = "ghcr.io/hyperledger/aries-builder-images/cross/aarch64-linux-android:main"

[target.armv7-linux-androideabi]
image = "ghcr.io/cross-rs/armv7-linux-androideabi:main"
image = "ghcr.io/hyperledger/aries-builder-images/cross/armv7-linux-androideabi:main"