From 9a7c90f02ae0ee21af4724331bc4935f2030135f Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Wed, 31 Jan 2024 23:19:26 -0500
Subject: [PATCH] Maybe fix ci

---
 .github/workflows/x86_64-linux-android.yml | 41 ++++------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/x86_64-linux-android.yml b/.github/workflows/x86_64-linux-android.yml
index 16d2482e1..017bd2786 100644
--- a/.github/workflows/x86_64-linux-android.yml
+++ b/.github/workflows/x86_64-linux-android.yml
@@ -11,8 +11,6 @@ env:
   OPENSSL_VERSION: 1.1.1s
   TOOLCHAIN: nightly
   CARGO_TERM_COLOR: always
-  CARGO_NDK_REV: "8478e58"
-  CARGO_TAI_REV: "90f487f"
 
 jobs:
   integration_tests:
@@ -34,17 +32,10 @@ jobs:
             ~/.cargo/git
             ~/.cargo/registry
             target
-          key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.TOOLCHAIN }}-cargo-${{ env.CARGO_NDK_REV }}-${{ env.CARGO_TAI_REV }}-${{ hashFiles('**/Cargo.lock') }}
-      - name: Install cargo-ndk
-        run: |
-          if ! command -v cargo-ndk &> /dev/null; then
-            cargo install --git  https://github.com/bbqsrc/cargo-ndk --rev ${CARGO_NDK_REV}
-          fi
-      - name: Install cargo-tai
-        run: |
-          if ! command -v cargo-tai &> /dev/null; then
-            cargo install --git https://github.com/liveview-native/cargo_tai --branch liveviewnative --rev ${CARGO_TAI_REV}
-          fi
+          key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.TOOLCHAIN }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-dinghy
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -61,21 +52,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-android-${{ env.cache-name }}-${{ env.ANDROID_COMMANDLINE_TOOLS_VERSION }}
             ${{ runner.os }}-mix-
-      - name: Download Android Command Line Tools
-        run: |
-          if [ ! -d "$HOME/android/cmdline-tools/${ANDROID_COMMANDLINE_TOOLS_VERSION}" ]; then
-            cd $HOME
-            # clear old version if it exists
-            rm -rf android
-            mkdir -p android/cmdline-tools
-            cd android/cmdline-tools
-            PACKAGE=commandlinetools-mac-${ANDROID_COMMANDLINE_TOOLS_VERSION}_latest
-            wget https://dl.google.com/android/repository/${PACKAGE}.zip
-            unzip ${PACKAGE}.zip
-            rm ${PACKAGE}.zip
-            mv cmdline-tools ${ANDROID_COMMANDLINE_TOOLS_VERSION}
-            ln -sf ${ANDROID_COMMANDLINE_TOOLS_VERSION} latest
-          fi
       - name: Add Android home and subdirectories to environment
         run: |
           export ANDROID_HOME="$HOME/android"
@@ -113,11 +89,6 @@ jobs:
           ${ANDROID_HOME}/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82'
           ${ANDROID_HOME}/platform-tools/adb devices
 
-      - name: Test with cargo-tai
+      - name: Test with cargo-dinghy
         run: |
-          export RUSTFLAGS="--cfg tokio_unstable"
-          cargo-tai tests --target x86_64-linux-android \
-                          --android-api-lvl ${ANDROID_API} \
-                          --android-ndk ${ANDROID_NDK_HOME} \
-                          --android-sdk ${ANDROID_HOME} \
-                          --envs LD_LIBRARY_PATH=lib
+          RANLIB=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib cargo-dinghy -p auto-android-aarch64-api${ANDROID_API} test