Skip to content

Commit

Permalink
ci: Fix Android breakage (#99)
Browse files Browse the repository at this point in the history
  • Loading branch information
notgull authored Mar 22, 2023
1 parent e10c7e8 commit e340458
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
18 changes: 10 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,26 @@ jobs:
- name: Install Rust
run: rustup update stable
- name: Install cross
uses: taiki-e/install-action@v2
with:
# https://github.com/cross-rs/cross/issues/724
tool: cross@0.2.1
uses: taiki-e/install-action@cross
# We don't test BSDs, since we already test them in Cirrus/vmactions.
- name: Android
if: startsWith(matrix.os, 'ubuntu')
run: cross test --target arm-linux-androideabi
- name: iOS
if: startsWith(matrix.os, 'macos')
run: cross build --target aarch64-apple-ios
run: |
rustup target add aarch64-apple-ios
cross build --target aarch64-apple-ios
- name: Linux x32
if: startsWith(matrix.os, 'ubuntu')
run: cross check --target x86_64-unknown-linux-gnux32
run: |
rustup target add x86_64-unknown-linux-gnux32
cross check --target x86_64-unknown-linux-gnux32
- name: Fuchsia
if: startsWith(matrix.os, 'ubuntu')
run: |
rustup target add x86_64-fuchsia
cargo build --target x86_64-fuchsia
rustup target add x86_64-unknown-fuchsia
cargo build --target x86_64-unknown-fuchsia
- name: illumos
if: startsWith(matrix.os, 'ubuntu')
run: |
Expand Down
3 changes: 3 additions & 0 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[target.arm-linux-androideabi]
# Workaround https://github.com/cross-rs/cross/issues/1128 / https://github.com/rust-lang/rust/issues/103673
image = "ghcr.io/cross-rs/arm-linux-androideabi:edge"

0 comments on commit e340458

Please sign in to comment.