From 4b86e46e40c89bbcd248c9d9204b345abf9101fd Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Sun, 12 Mar 2023 15:16:26 +0900
Subject: [PATCH] Use setup-cross-toolchain-action instead of cross

---
 .github/workflows/ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1635c677..07a39cc1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,24 +48,24 @@ jobs:
       - run: cargo test --workspace --all-features --release
 
   cross:
-    name: cross test --target ${{ matrix.target }}
+    name: cargo test --target ${{ matrix.target }}
     strategy:
       fail-fast: false
       matrix:
         target:
-          - i686-unknown-linux-gnu
           - aarch64-unknown-linux-gnu
+          - armv7-unknown-linux-gnueabihf
+          - i686-unknown-linux-gnu
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Install Rust
         run: rustup update nightly && rustup default nightly
-      - name: Install cross
-        uses: taiki-e/install-action@cross
-      - run: cross test --target ${{ matrix.target }} --workspace --all-features
-      - run: cross test --target ${{ matrix.target }} --workspace --all-features --release
-        # TODO: https://github.com/rust-lang/futures-rs/issues/2451
-        if: matrix.target != 'aarch64-unknown-linux-gnu'
+      - uses: taiki-e/setup-cross-toolchain-action@v1
+        with:
+          target: ${{ matrix.target }}
+      - run: cargo test --target ${{ matrix.target }} --workspace --all-features $DOCTEST_XCOMPILE
+      - run: cargo test --target ${{ matrix.target }} --workspace --all-features --release $DOCTEST_XCOMPILE
 
   core-msrv:
     name: cargo +${{ matrix.rust }} build (futures-{core, io, sink})