Skip to content

Commit 88770aa

Browse files
author
007
committed
Replace armv5/armv6 with armv7 (musl+gnue). Pin cross v0.2.5, skip qemu tests on cross targets.
1 parent 940fbc1 commit 88770aa

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

.github/workflows/rust.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ env:
2020
RUST_BACKTRACE: 1
2121
CARGO_INCREMENTAL: 0
2222
CARGO_PROFILE_DEV_DEBUG: 0
23+
CROSS_VERSION: v0.2.5
2324

2425
concurrency:
2526
group: ${{ github.workflow }}-${{ github.event.ref }}
@@ -65,7 +66,7 @@ jobs:
6566
cross: true,
6667
}
6768
- {
68-
os: "windows-2019",
69+
os: "windows-latest",
6970
target: "x86_64-pc-windows-msvc",
7071
cross: false,
7172
}
@@ -89,16 +90,14 @@ jobs:
8990
target: "i686-unknown-linux-musl",
9091
cross: true,
9192
}
92-
# armv6
9393
- {
9494
os: "ubuntu-latest",
95-
target: "arm-unknown-linux-musleabi",
95+
target: "armv7-unknown-linux-gnueabihf",
9696
cross: true,
9797
}
98-
# arm5
9998
- {
10099
os: "ubuntu-latest",
101-
target: "armv5te-unknown-linux-musleabi",
100+
target: "armv7-unknown-linux-musleabihf",
102101
cross: true,
103102
}
104103
features: ["--all-features", "--no-default-features"]
@@ -121,15 +120,19 @@ jobs:
121120

122121
- name: Install cross
123122
if: ${{ matrix.info.cross }}
124-
uses: taiki-e/install-action@v2
125-
with:
126-
tool: cross
123+
run: |
124+
dir="$RUNNER_TEMP/cross-download"
125+
mkdir "$dir"
126+
echo "$dir" >> $GITHUB_PATH
127+
cd "$dir"
128+
curl -LO "https://github.com/cross-rs/cross/releases/download/$CROSS_VERSION/cross-x86_64-unknown-linux-musl.tar.gz"
129+
tar xf cross-x86_64-unknown-linux-musl.tar.gz
127130
128131
- name: Check cargo fmt
129132
run: cargo fmt --all -- --check
130133

131134
- name: Run clippy
132-
if: ${{ !matrix.info.cross }}
135+
if: ${{ !matrix.info.cross && matrix.info.target != 'aarch64-apple-darwin' }}
133136
run: cargo clippy --all-features --target=${{ matrix.info.target }} -- -D warnings
134137

135138
- name: Build tests
@@ -138,7 +141,8 @@ jobs:
138141
RUST_BACKTRACE: full
139142

140143
- name: Run tests
141-
run: ${{ matrix.info.cross && 'cross' || 'cargo' }} test --no-fail-fast ${{ matrix.features }} --target=${{ matrix.info.target }} -- --nocapture --quiet
144+
if: ${{ !matrix.info.cross }}
145+
run: cargo test --no-fail-fast ${{ matrix.features }} --target=${{ matrix.info.target }} -- --nocapture --quiet
142146
env:
143147
RUST_BACKTRACE: full
144148

0 commit comments

Comments
 (0)