Skip to content

Commit 9638d26

Browse files
committed
GHA Debugging 10 - TO BE SQUASHED
Moved flash-zephyr-base-b_u585i to be closer to subsequent job steps. Included some debugging in flash-zephyr-modbus_server to debug CMake error. Signed-off-by: Matthew Gee <mgee@iol.unh.edu>
1 parent 166e87a commit 9638d26

1 file changed

Lines changed: 21 additions & 31 deletions

File tree

.github/workflows/build.yml

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,6 @@ jobs:
127127
exit 1
128128
fi
129129
130-
flash-zephyr-base-b_u585i_iot02a:
131-
needs: build-zephyr-base
132-
runs-on: zephyr-xlarge-runner
133-
steps:
134-
- name: Download Zephyr build artifact(b_u585i_iot02a)
135-
if: runner.environment == 'self-hosted'
136-
uses: actions/download-artifact@v4
137-
with:
138-
name: ocre-zephyr-b_u585i_iot02a-app
139-
140-
- name: Flash b_u585i_iot02a
141-
if: runner.environment == 'self-hosted'
142-
run: |
143-
STM32_Programmer_CLI -c port=swd -e all -w zephyr.bin 0x08000000 -v -rst
144-
145130
# Build and upload wasm files as artifacts
146131
build-wasm-files:
147132
runs-on: zephyr-xlarge-runner
@@ -217,15 +202,7 @@ jobs:
217202
218203
mkdir -p "$SAMPLE_DIR/build"
219204
cd "$SAMPLE_DIR/build"
220-
echo "----"
221-
ls ../../../wasm-micro-runtime/core/
222-
echo "----"
223205
cmake .. -DCMAKE_TOOLCHAIN_FILE=$WASI_SDK_PATH/share/cmake/wasi-sdk.cmake
224-
make
225-
pwd
226-
ls $GITHUB_WORKSPACE/ocre-sdk/${{ matrix.sample.path }}/build
227-
ls
228-
ls $GITHUB_WORKSPACE
229206

230207
env:
231208
WASI_SDK_PATH: /opt/wasi-sdk
@@ -293,13 +270,6 @@ jobs:
293270
echo "=== Build app ==="
294271
./build.sh -t l
295272
296-
- name: Test .wasm file
297-
run: |
298-
ls -lah
299-
ls -lah $GITHUB_WORKSPACE
300-
ls -lah $GITHUB_WORKSPACE/${{ matrix.sample.name }}
301-
file $GITHUB_WORKSPACE/${{ matrix.sample.name }}
302-
303273
- name: Run Sample ${{ matrix.sample.name }}
304274
working-directory: application/build
305275
run: |
@@ -409,6 +379,21 @@ jobs:
409379
exit 1
410380
fi
411381
382+
flash-zephyr-base-b_u585i_iot02a:
383+
needs: build-zephyr-base
384+
runs-on: zephyr-xlarge-runner
385+
steps:
386+
- name: Download Zephyr build artifact(b_u585i_iot02a)
387+
if: runner.environment == 'self-hosted'
388+
uses: actions/download-artifact@v4
389+
with:
390+
name: ocre-zephyr-b_u585i_iot02a-app
391+
392+
- name: Flash b_u585i_iot02a
393+
if: runner.environment == 'self-hosted'
394+
run: |
395+
STM32_Programmer_CLI -c port=swd -e all -w zephyr.bin 0x08000000 -v -rst
396+
412397
flash-validation-tests:
413398
needs: flash-zephyr-base-b_u585i_iot02a
414399
runs-on: zephyr-xlarge-runner
@@ -433,7 +418,7 @@ jobs:
433418

434419

435420
flash-zephyr-modbus_server-b_u585i_iot02a:
436-
needs: build-wasm-files
421+
needs: [build-wasm-files, flash-validation-tests]
437422
runs-on: zephyr-xlarge-runner
438423
container:
439424
image: ghcr.io/zephyrproject-rtos/ci:v0.26-branch
@@ -472,6 +457,11 @@ jobs:
472457
app-path: application
473458
sdk-version: 0.16.8
474459

460+
- name: Test flash requirements
461+
run: |
462+
ls
463+
ls $GITHUB_WORKSPACE/build
464+
475465
- name: Flash b_u585i_iot02a
476466
if: runner.environment == 'self-hosted'
477467
run: |

0 commit comments

Comments
 (0)