Skip to content

Commit 5dacac8

Browse files
author
blu3beri
committed
build(android): use custom cross images
Signed-off-by: blu3beri <[email protected]>
1 parent 8bb174f commit 5dacac8

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 'Anoncreds'
22

33
env:
4-
RUST_VERSION: '1.63.0'
4+
RUST_VERSION: '1.64.0'
55
CROSS_VERSION: '0.2.4'
66

77
on:
@@ -124,6 +124,7 @@ jobs:
124124
if: "matrix.target != 'darwin-universal'"
125125
uses: dtolnay/rust-toolchain@stable
126126
with:
127+
toolchain: ${{ env.RUST_VERSION }}
127128
targets: ${{ matrix.target }}
128129

129130
- name: Cache cargo resources
@@ -142,7 +143,7 @@ jobs:
142143
if: "runner.os == 'Linux'"
143144
run: |
144145
if [ -n "${{ matrix.use_cross }}" ]; then
145-
cargo install --bins --git https://github.com/rust-embedded/cross --tag v${{ env.CROSS_VERSION }} cross
146+
cargo install --git https://github.com/cross-rs/cross --tag v${{ env.CROSS_VERSION }} cross
146147
cross build --release --package anoncreds --target ${{matrix.target}} --features vendored
147148
else
148149
cargo build --release --package anoncreds --target ${{matrix.target}} --features vendored
@@ -340,14 +341,15 @@ jobs:
340341
- name: Install Rust toolchain
341342
uses: dtolnay/rust-toolchain@stable
342343
with:
344+
toolchain: ${{ env.RUST_VERSION }}
343345
targets: ${{ matrix.target }}
344346

345347
- name: Cache cargo resources
346348
uses: Swatinem/rust-cache@v2
347349

348350
- name: Build
349351
run: |
350-
cargo install --bins --git https://github.com/rust-embedded/cross --tag v${{ env.CROSS_VERSION }} cross
352+
cargo install --git https://github.com/cross-rs/cross --tag v${{ env.CROSS_VERSION }} cross
351353
cross build --release --target ${{ matrix.target }} --features=vendored
352354
353355
- name: Upload artifacts

Cross.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ image = "ghcr.io/rust-cross/manylinux2014-cross:aarch64"
55
image = "ghcr.io/rust-cross/manylinux2014-cross:x86_64"
66

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

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

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

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

0 commit comments

Comments
 (0)