From 748d45c73f883b946d41f715d44d15656f231063 Mon Sep 17 00:00:00 2001
From: TheGuyDanish <5776313+TheGuyDanish@users.noreply.github.com>
Date: Sat, 12 Oct 2024 18:05:50 +0200
Subject: [PATCH] workflow update

---
 .github/workflows/package.yaml | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 136a85a..aa3eb41 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -25,8 +25,6 @@ jobs:
         uses: actions/checkout@main
         with:
           repository: 'openjbod/micropython'
-          ref: 'v1.23.0'
-          submodules: 'true'
           path: 'openjbod'
 
       - name: Checkout OpenJBOD software
@@ -34,15 +32,15 @@ jobs:
         with:
           path: 'software'
 
-      - name: "Install build tools"
-        run: "sudo apt-get install pkg-config gcc-arm-none-eabi libnewlib-arm-none-eabi"
+      - name: Install build tools
+        run: sudo apt-get install pkg-config gcc-arm-none-eabi libnewlib-arm-none-eabi
 
-      - name: "Setup Python"
+      - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
-      - name: "Install Python requirements"
+      - name: Install Python requirements
         run: "pip install freezefs"
 
       - name: Gzip static files
@@ -51,9 +49,28 @@ jobs:
       - name: Create release zip
         run: "zip openjbod.zip -r software/* -x README.md LICENSE.md @"
 
+      - name: Upload release zip
+        uses: actions/upload-artifact@v4
+          name: openjbod.zip
+          path: openjbod.zip
+
       - name: Freeze OpenJBOD Software
         run: python3 -m freezefs software/ micropython/ports/rp2/boards/OPENJBOD_RP2040/frozen_openjbod.py --on-import=extract --compress -t / -ov always
 
+      - name: Build mpy-cross
+        run: make -j $(nproc) -C micropython/mpy-cross/
+
+      - name: Fetch MicroPython submodules
+        run: make -j $(nproc) -C micropython/ports/rp2 BOARD=OPENJBOD_RP2040 submodules
+
+      - name: Build MicroPython
+        run: make -j $(nproc) -C micropython/ports/rp2 BOARD_OPENJBOD_RP2040
+
+      - name: Upload MicroPython artifact
+        uses: actions/upload-artifact@v4
+          name: openjbod-micropython.uf2
+          path: micropython/ports/rp2/build-OPENJBOD_RP2040/firmware.uf2
+
       - name: Create release
         id: create_release
         uses: actions/create-release@latest