Skip to content

Commit a99ab63

Browse files
committed
Remove unneeded steps in the workflow
Addresses comments brought up during review regarding unnecessary steps in the action workflow and minor syntax corrections. Still have to address the artifact storage method for .wasm files and their artifacts. (Squahsed with other commit to fix build errors arising from removing certain steps) Signed-off-by: Matthew Gee <mgee@iol.unh.edu>
1 parent 5412336 commit a99ab63

File tree

1 file changed

+9
-48
lines changed

1 file changed

+9
-48
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -166,24 +166,13 @@ jobs:
166166
repository: project-ocre/ocre-sdk
167167
path: ocre-sdk
168168

169-
- name: Update Submodules
170-
working-directory: application
171-
run: |
172-
git submodule update --init --recursive
173-
174169
# Needed in order for board specific modules to build successfully
175170
- name: Copy wasm submodule
176171
working-directory: ocre-sdk
177172
run: |
178173
git submodule update --init --recursive
179174
cp -r wasm-micro-runtime board_specific/wasm-micro-runtime
180175
181-
- name: Setup Zephyr project
182-
uses: zephyrproject-rtos/action-zephyr-setup@v1
183-
with:
184-
app-path: application
185-
sdk-version: 0.16.8
186-
187176
- name: Install tools (xxd + WASI SDK)
188177
run: |
189178
sudo apt-get update
@@ -238,31 +227,12 @@ jobs:
238227
expected: "blink (count: 1, state: -)"
239228
# Add here more samples
240229
steps:
241-
- name: Install tools (xxd + WASI SDK)
242-
run: |
243-
sudo apt-get update
244-
sudo apt-get install -y wget build-essential
245-
wget https://github.com/vim/vim/archive/refs/tags/v9.1.1000.tar.gz -O vim.tar.gz
246-
tar -xvf vim.tar.gz
247-
cd vim-9.1.1000/src && make -j$(nproc) && sudo cp xxd/xxd /usr/local/bin/xxd
248-
249-
wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz
250-
tar -xvf wasi-sdk-25.0-x86_64-linux.tar.gz
251-
sudo mv wasi-sdk-25.0-x86_64-linux /opt/wasi-sdk
252-
env:
253-
WASI_SDK_PATH: /opt/wasi-sdk
254230

255231
- name: Checkout current repository
256232
uses: actions/checkout@v4
257233
with:
258234
path: application
259235

260-
- name: Clone ocre-sdk
261-
uses: actions/checkout@v4
262-
with:
263-
repository: project-ocre/ocre-sdk
264-
path: ocre-sdk
265-
266236
- name: Download wasm artifact
267237
uses: actions/download-artifact@v4
268238
with:
@@ -312,35 +282,29 @@ jobs:
312282
- name: generic-filesystem-full
313283
build-file: filesystem-full.wasm
314284
expected: "Directory listing for"
285+
- name: generic-blinky
286+
build-file: blinky.wasm
287+
expected: "blink (count: 1, state: -)"
315288
steps:
316-
- name: Install tools (xxd + WASI SDK)
289+
- name: Cleanup workspace
290+
uses: eviden-actions/clean-self-hosted-runner@v1
291+
292+
- name: Install tools (xxd)
317293
run: |
318294
sudo apt-get update
319295
sudo apt-get install -y wget build-essential
320296
wget https://github.com/vim/vim/archive/refs/tags/v9.1.1000.tar.gz -O vim.tar.gz
321297
tar -xvf vim.tar.gz
322298
cd vim-9.1.1000/src && make -j$(nproc) && sudo cp xxd/xxd /usr/local/bin/xxd
323299
324-
wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz
325-
tar -xvf wasi-sdk-25.0-x86_64-linux.tar.gz
326-
sudo mv wasi-sdk-25.0-x86_64-linux /opt/wasi-sdk
327300
env:
328301
WASI_SDK_PATH: /opt/wasi-sdk
329302

330-
- name: Cleanup workspace
331-
uses: eviden-actions/clean-self-hosted-runner@v1
332-
333303
- name: Checkout current repository
334304
uses: actions/checkout@v4
335305
with:
336306
path: application
337307

338-
- name: Clone ocre-sdk
339-
uses: actions/checkout@v4
340-
with:
341-
repository: project-ocre/ocre-sdk
342-
path: ocre-sdk
343-
344308
- name: Setup Zephyr project
345309
uses: zephyrproject-rtos/action-zephyr-setup@v1
346310
with:
@@ -431,7 +395,7 @@ jobs:
431395

432396

433397
build-zephyr-modbus_server-b_u585i_iot02a:
434-
needs: [build-wasm-files]
398+
needs: build-wasm-files
435399
runs-on: zephyr-xlarge-runner
436400
container:
437401
image: ghcr.io/zephyrproject-rtos/ci:v0.26-branch
@@ -450,17 +414,14 @@ jobs:
450414
run: |
451415
git submodule update --init --recursive
452416
453-
- name: Install tools (xxd + WASI SDK)
417+
- name: Install tools (xxd)
454418
run: |
455419
sudo apt-get update
456420
sudo apt-get install -y wget build-essential
457421
wget https://github.com/vim/vim/archive/refs/tags/v9.1.1000.tar.gz -O vim.tar.gz
458422
tar -xvf vim.tar.gz
459423
cd vim-9.1.1000/src && make -j$(nproc) && sudo cp xxd/xxd /usr/local/bin/xxd
460424
461-
wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz
462-
tar -xvf wasi-sdk-25.0-x86_64-linux.tar.gz
463-
sudo mv wasi-sdk-25.0-x86_64-linux /opt/wasi-sdk
464425
env:
465426
WASI_SDK_PATH: /opt/wasi-sdk
466427

0 commit comments

Comments
 (0)