From e340458d3a291207a4a5dcaa00e060ed6df05bc5 Mon Sep 17 00:00:00 2001
From: John Nunley <jtnunley01@gmail.com>
Date: Wed, 22 Mar 2023 11:21:31 -0700
Subject: [PATCH] ci: Fix Android breakage (#99)

---
 .github/workflows/ci.yml | 18 ++++++++++--------
 Cross.toml               |  3 +++
 2 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 Cross.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 945bb75..aef696b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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: |
diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 0000000..856f9b4
--- /dev/null
+++ b/Cross.toml
@@ -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"