Github Artifact Cleanup

Removed artifacting of log files and combined wasm artifact uploads into
a singluar artifact. Currently the build wasm step saves all artifacts
to a directory local on disk and they are artifacted in a seperate step.
The directory used is cleaned at the end of the workflow to prevent runs
from affecting each other.

Signed-off-by: Matthew Gee <mgee@iol.unh.edu>

Author: mgeeIOL

.github/workflows/build.yml

@@ -135,7 +135,7 @@ jobs:
     runs-on: zephyr-xlarge-runner
     container:
       image: ghcr.io/zephyrproject-rtos/ci:v0.26-branch
-      options: --user root
+      options: --user root -v /var/ocre-ci-files/:/var/ocre-ci-files/
     strategy:
       matrix:
         sample:
@@ -203,15 +203,34 @@ jobs:
         env:
           WASI_SDK_PATH: /opt/wasi-sdk
 
-      - name: Upload .wasm artifact
+      # Replace with cp to /var/ocre-ci-files
+      # - name: Upload .wasm artifact
+      #   if: always()
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: "${{ matrix.sample.name }}"
+      #     path: "ocre-sdk/${{ matrix.sample.path }}/build/${{ matrix.sample.filename }}"
+
+      # Saving files to the runner so avoid uploading .wasm files as artifacts 
+      - name: Save .wasm artifact locally
+        if: always()
+        run: cp "ocre-sdk/${{ matrix.sample.path }}/build/${{ matrix.sample.filename }}" "/var/ocre-ci-files/wasm/${{ matrix.sample.filename }}"
+
+  artifact-wasm-files:
+    needs: build-wasm-files
+    runs-on: zephyr-xlarge-runner
+    steps:
+      - name: Artifact local wasm files
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: "${{ matrix.sample.name }}"
-          path: "ocre-sdk/${{ matrix.sample.path }}/build/${{ matrix.sample.filename }}"
+          name: wasm-build-artifacts
+          path: "/var/ocre-ci/files/wasm"
+
+
 
   build-and-run-linux-sample:
-    needs: build-wasm-files
+    needs: artifact-wasm-files
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -236,8 +255,9 @@ jobs:
       - name: Download wasm artifact
         uses: actions/download-artifact@v4
         with:
-          name: "${{ matrix.sample.name }}"
-          path: ${{ matrix.sample.name }}
+          name: wasm-build-artifacts
+          path: wasm-build-artifacts
+
 
       - name: Update Submodules
         working-directory: application
@@ -254,7 +274,7 @@ jobs:
         working-directory: application/build
         run: |
           echo "=== Running sample: ${{ matrix.sample.name }} ==="
-          WASM_FILE=$GITHUB_WORKSPACE/${{ matrix.sample.name }}/${{ matrix.sample.build-file }}
+          WASM_FILE=$GITHUB_WORKSPACE/wasm-build-artifacts/${{ matrix.sample.name }}/${{ matrix.sample.build-file }}
           chmod +x app
           stdbuf -oL -eL timeout 20s ./app $WASM_FILE | tee "${{ matrix.sample.name }}_run.log"
 
@@ -268,7 +288,7 @@ jobs:
  
   # Run zephyr agent on github actions runner
   build-and-run-zephyr-sample:
-    needs: build-wasm-files
+    needs: artifact-wasm-files
     runs-on: zephyr-xlarge-runner
     container:
       image: ghcr.io/zephyrproject-rtos/ci:v0.26-branch
@@ -312,11 +332,10 @@ jobs:
           sdk-version: 0.16.8
 
       - name: Download wasm artifact
-        if: runner.environment == 'self-hosted'
         uses: actions/download-artifact@v4
         with:
-          name: "${{ matrix.sample.name }}"
-          path: ${{ matrix.sample.name }}
+          name: wasm-build-artifacts
+          path: wasm-build-artifacts
 
       - name: Update Submodules
         working-directory: application
@@ -326,7 +345,7 @@ jobs:
       - name: Build Zephyr app
         run: |
           echo "=== Build app ==="
-          WASM_FILE=$GITHUB_WORKSPACE/${{ matrix.sample.name }}/${{ matrix.sample.build-file }}
+          WASM_FILE=$GITHUB_WORKSPACE/wasm-build-artifacts/${{ matrix.sample.name }}/${{ matrix.sample.build-file }}
           west build --pristine -b native_sim ./application -d build -- \
             -DMODULE_EXT_ROOT=$(pwd)/application \
             -DOCRE_INPUT_FILE=$WASM_FILE
@@ -386,12 +405,13 @@ jobs:
         if: always()
         run: cat /tmp/flashValidation.log
 
-      - name: Upload log file as artifact
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: "FlashValidation.log"
-          path: /tmp/flashValidation.log
+      # Remove
+      # - name: Upload log file as artifact
+      #   if: always()
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: "FlashValidation.log"
+      #     path: /tmp/flashValidation.log
 
 
   build-zephyr-modbus_server-b_u585i_iot02a:
@@ -425,11 +445,11 @@ jobs:
         env:
           WASI_SDK_PATH: /opt/wasi-sdk
 
-      - name: Download WASM artifact
+      - name: Download wasm artifact
         uses: actions/download-artifact@v4
         with:
-          name: b_u585i-modbus-server
-          path: b_u585i-modbus-server
+          name: wasm-build-artifacts
+          path: wasm-build-artifacts
 
       - name: Setup Zephyr project
         uses: zephyrproject-rtos/action-zephyr-setup@v1
@@ -439,7 +459,7 @@ jobs:
 
       - name: Build b_u585i_iot02a with modbus-server
         run: |
-          WASM_FILE=$GITHUB_WORKSPACE/b_u585i-modbus-server/modbus-server.wasm
+          WASM_FILE=$GITHUB_WORKSPACE/wasm-build-artifacts/b_u585i-modbus-server/modbus-server.wasm
           west -v build --pristine=auto -b b_u585i_iot02a ./application -d build -- \
             -DMODULE_EXT_ROOT=$(pwd)/application \
             -DOCRE_INPUT_FILE=$WASM_FILE \
@@ -487,10 +507,19 @@ jobs:
         if: always()
         run: cat /tmp/modbusServerValidation.log
 
-      - name: Upload log file as artifact
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-            name: "ModbusServerValidation.log"
-            path: /tmp/modbusServerValidation.log
-      
+      # Remove
+      # - name: Upload log file as artifact
+      #   if: always()
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #       name: "ModbusServerValidation.log"
+      #       path: /tmp/modbusServerValidation.log
+      
+
+  runner-cleanup:
+    # All non-blocking jobs 
+    needs: [modbus-server-validation-tests, run-zephyr-base-native-sim, build-and-run-linux-sample, build-and-run-zephyr-sample, run-linux-base]
+    runs-on: zephyr-xlarge-runner
+    steps:
+      - name: Remove old workflow files
+        run: rm -rf /var/ocre-ci-files/*