Skip to content

Commit 61a5f8c

Browse files
github: workflows: Align invocations of twister
upstream-build.yml and build.yml didn't invoke twister in the same nor with the same tests. Note $EXTRA_TWISTER_FLAGS was used in all the tests. Yet, CI still runs on Windows. So, this commit get rid of EXTRA_TWISTER_FLAGS in all the invocations. Signed-off-by: Jérôme Pouiller <[email protected]>
1 parent d876f0b commit 61a5f8c

File tree

2 files changed

+37
-18
lines changed

2 files changed

+37
-18
lines changed

.github/workflows/build.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,28 @@ jobs:
3333
toolchains: arm-zephyr-eabi
3434

3535
- name: Fetch blobs
36+
working-directory: zephyr-silabs
37+
shell: bash
3638
run: |
3739
west blobs fetch hal_silabs
3840
39-
- name: Build hello world
41+
- name: Build Bluetooth samples
42+
continue-on-error: true
43+
working-directory: zephyr-silabs
44+
shell: bash
45+
run: |
46+
west twister -s sample.bluetooth.peripheral_hr -p siwx917_rb4338a -v --inline-logs -K
47+
48+
- name: Build Rail samples
49+
continue-on-error: true
50+
working-directory: zephyr-silabs
51+
shell: bash
52+
run: |
53+
west twister -s sample.rail.simple_txrx -T samples -v --inline-logs
54+
55+
- name: Build Wifi samples
56+
continue-on-error: true
4057
working-directory: zephyr-silabs
4158
shell: bash
4259
run: |
43-
if [ "${{ runner.os }}" = "Windows" ]; then
44-
EXTRA_TWISTER_FLAGS="--short-build-path -O/tmp/twister-out"
45-
fi
46-
west twister --test sample.basic.helloworld -p siwx917_rb4338a -v --inline-logs $EXTRA_TWISTER_FLAGS
47-
west twister --test sample.net.wifi -p siwx917_rb4338a -v --inline-logs -K $EXTRA_TWISTER_FLAGS
48-
west twister --test sample.bluetooth.peripheral_hr -p siwx917_rb4338a -v --inline-logs -K $EXTRA_TWISTER_FLAGS
49-
west twister --test sample.rail.simple_txrx -T samples -v --inline-logs $EXTRA_TWISTER_FLAGS
60+
west twister -s sample.net.wifi -p siwx917_rb4338a -v --inline-logs -K

.github/workflows/upstream-build.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,31 @@ jobs:
3636
sed s/$Z_REV/main/ west.yml > west.yml.new
3737
mv west.yml.new west.yml
3838
west update
39+
40+
- name: Fetch blobs
41+
working-directory: zephyr-silabs
42+
shell: bash
43+
run: |
3944
west blobs fetch hal_silabs
4045
41-
- name: Build Bluetooth sample for xG27
46+
- name: Build Bluetooth samples
47+
continue-on-error: true
48+
working-directory: zephyr-silabs
49+
shell: bash
50+
run: |
51+
west twister -s sample.bluetooth.peripheral_hr -p xg27_dk2602a -v --inline-logs -K
52+
west twister -s sample.bluetooth.peripheral_hr -p siwx917_rb4338a -v --inline-logs -K
53+
54+
- name: Build Rail samples
4255
continue-on-error: true
4356
working-directory: zephyr-silabs
4457
shell: bash
4558
run: |
46-
west twister -K -p xg27_dk2602a --test sample.bluetooth.peripheral_hr
59+
west twister -s sample.rail.simple_txrx -T samples -v --inline-logs
4760
48-
- name: Build hello world for siwx917_rb4338a
61+
- name: Build Wifi samples
62+
continue-on-error: true
4963
working-directory: zephyr-silabs
5064
shell: bash
5165
run: |
52-
if [ "${{ runner.os }}" = "Windows" ]; then
53-
EXTRA_TWISTER_FLAGS="--short-build-path -O/tmp/twister-out"
54-
fi
55-
west twister -T ../zephyr/samples -s sample.basic.helloworld -p siwx917_rb4338a -v --inline-logs $EXTRA_TWISTER_FLAGS
56-
west twister -T ../zephyr/samples -s sample.net.wifi -p siwx917_rb4338a -v --inline-logs -K $EXTRA_TWISTER_FLAGS
57-
west twister -T ../zephyr/samples -s sample.bluetooth.peripheral_hr -p siwx917_rb4338a -v --inline-logs -K $EXTRA_TWISTER_FLAGS
58-
west twister -T samples -s sample.rail.simple_txrx -v --inline-logs $EXTRA_TWISTER_FLAGS
66+
west twister -s sample.net.wifi -p siwx917_rb4338a -v --inline-logs -K

0 commit comments

Comments
 (0)