Skip to content

Commit

Permalink
build(android): fix rust version issue
Browse files Browse the repository at this point in the history
Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io>
  • Loading branch information
berendsliedrecht committed Dec 19, 2023
1 parent 5c5bc06 commit 4676879
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,6 @@ jobs:
build-android:
name: Build library (Android)
needs: [checks]
env:
RUST_VERSION: "1.67"

runs-on: ubuntu-latest

Expand Down Expand Up @@ -431,7 +429,7 @@ jobs:

- name: Build
run: |
cargo install --bins --git https://github.com/rust-embedded/cross --tag v${{ env.CROSS_VERSION }} cross
cargo install cross --version 0.2.5
# Required for compatibility with manylinux2014:
# https://github.com/briansmith/ring/issues/1728
if [ "${{ matrix.target }}" = "aarch64-linux-android" ]; then
Expand Down
22 changes: 11 additions & 11 deletions Cross.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ image = "ghcr.io/rust-cross/manylinux2014-cross:aarch64"
[target.x86_64-unknown-linux-gnu]
image = "ghcr.io/rust-cross/manylinux2014-cross:x86_64"

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

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

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

[target.armv7-linux-androideabi]
image = "ghcr.io/hyperledger/aries-builder-images/cross/armv7-linux-androideabi:main"
# [target.x86_64-linux-android]
# image = "ghcr.io/hyperledger/aries-builder-images/cross/x86_64-linux-android:main"
#
# [target.i686-linux-android]
# image = "ghcr.io/hyperledger/aries-builder-images/cross/i686-linux-android:main"
#
# [target.aarch64-linux-android]
# image = "ghcr.io/hyperledger/aries-builder-images/cross/aarch64-linux-android:main"
#
# [target.armv7-linux-androideabi]
# image = "ghcr.io/hyperledger/aries-builder-images/cross/armv7-linux-androideabi:main"

0 comments on commit 4676879

Please sign in to comment.