Skip to content

Commit 24dd9a9

Browse files
feat: melding targets and include for intrinsic-test CI step
1 parent 9d6f824 commit 24dd9a9

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -258,33 +258,24 @@ jobs:
258258
profile:
259259
- dev
260260
- release
261-
target:
262-
# Dockers that are run through docker on linux
263-
- tuple: arm-unknown-linux-gnueabihf
264-
os: ubuntu-latest
265-
- tuple: armv7-unknown-linux-gnueabihf
266-
os: ubuntu-latest
267-
- tuple: aarch64-unknown-linux-gnu
268-
os: ubuntu-latest
269-
- tuple: aarch64_be-unknown-linux-gnu
270-
os: ubuntu-latest
271261

272-
# Add additional variables to the matrix variations generated above using `include`:
273262
include:
274-
# `TEST_EVERYTHING` setups - there should be at least 1 for each architecture
275263
- target:
276264
tuple: aarch64-unknown-linux-gnu
277265
os: ubuntu-latest
278-
test_everything: true
266+
279267
- target:
280268
tuple: aarch64_be-unknown-linux-gnu
281269
os: ubuntu-latest
282-
test_everything: true
283270
build_std: true
271+
284272
- target:
285273
tuple: armv7-unknown-linux-gnueabihf
286274
os: ubuntu-latest
287-
test_everything: true
275+
276+
- target:
277+
tuple: arm-unknown-linux-gnueabihf
278+
os: ubuntu-latest
288279

289280
steps:
290281
- uses: actions/checkout@v4
@@ -295,12 +286,12 @@ jobs:
295286
shell: bash
296287
- run: rustup target add ${{ matrix.target.tuple }}
297288
shell: bash
298-
if: matrix.build_std == ''
289+
if: ${{ (matrix.build_std || false) == false }}
299290
- run: |
300291
rustup component add rust-src
301292
echo "CARGO_UNSTABLE_BUILD_STD=std" >> $GITHUB_ENV
302293
shell: bash
303-
if: matrix.build_std != ''
294+
if: ${{ (matrix.build_std || false) == true }}
304295
305296
# Configure some env vars based on matrix configuration
306297
- run: echo "PROFILE=--profile=${{matrix.profile}}" >> $GITHUB_ENV

ci/intrinsic-test-docker.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ run() {
3131
--env CARGO_TARGET_DIR=/checkout/target \
3232
--env TARGET="${1}" \
3333
--env "${HOST_LINKER}"="cc" \
34-
--env STDARCH_TEST_EVERYTHING \
3534
--env STDARCH_DISABLE_ASSERT_INSTR \
3635
--env NOSTD \
3736
--env NORUN \

0 commit comments

Comments
 (0)