Skip to content

Commit 811dc6d

Browse files
committed
Don't use cross for the i686 target
1 parent a78e8f2 commit 811dc6d

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,14 @@ jobs:
200200

201201
strategy:
202202
matrix:
203-
target: [ i686-unknown-linux-musl, armv7-linux-androideabi ]
203+
target:
204+
- i686-unknown-linux-musl
205+
- armv7-linux-androideabi
206+
include:
207+
- target: i686-unknown-linux-musl
208+
cargo: cargo
209+
- target: armv7-linux-androideabi
210+
cargo: cross
204211

205212
steps:
206213
- uses: actions/checkout@v4
@@ -211,15 +218,17 @@ jobs:
211218
with:
212219
toolchain: stable
213220
targets: ${{ matrix.target }}
214-
- uses: taiki-e/install-action@v2
221+
- name: Install cross
222+
if: matrix.cargo == 'cross'
223+
uses: taiki-e/install-action@v2
215224
with:
216225
tool: cross
217226
- name: check
218-
run: cross check -p gix --target ${{ matrix.target }}
227+
run: ${{ matrix.cargo }} check -p gix --target ${{ matrix.target }}
219228
- name: Test (unit)
220229
# run high-level unit tests that exercise a lot of code while being pure Rust to ease building test binaries.
221230
# TODO: figure out why `git` doesn't pick up environment configuration so build scripts fail when using `-p gix`.
222-
run: cross test -p gix-hashtable --target ${{ matrix.target }}
231+
run: ${{ matrix.cargo }} test -p gix-hashtable --target ${{ matrix.target }}
223232

224233
lint:
225234
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)