From 68c63de11d2072c5013323d6ea46e88789c27f72 Mon Sep 17 00:00:00 2001
From: ZodiusInfuser <christopher.parrott2@gmail.com>
Date: Tue, 8 Oct 2024 15:20:18 +0100
Subject: [PATCH] Change structure of zips created

---
 .github/workflows/filesystem.yml | 34 ++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/filesystem.yml b/.github/workflows/filesystem.yml
index 1367524..2c674a4 100644
--- a/.github/workflows/filesystem.yml
+++ b/.github/workflows/filesystem.yml
@@ -19,6 +19,11 @@ jobs:
 
     env:
       RELEASE_FILE: ${{matrix.shortname}}-${{github.event.release.tag_name || github.sha}}
+      ROOT_DIR: "picofx"
+      BOARD_DIR: "picofx/boards/${{matrix.board}}"
+      EXAMPLES_DIR: "picofx/examples/${{matrix.shortname}}"
+      LIBS_DIR: "picofx/lib_temp"
+      EX_DIR: "picofx/ex_temp"
 
     steps:
     - uses: actions/checkout@v4
@@ -26,17 +31,34 @@ jobs:
         submodules: true
         path: picofx
 
+    - name: "Assemble lib content"
+      shell: bash
+      run: |
+        mkdir -p ${{env.LIBS_DIR}}/lib
+        cp -v -r ${{env.ROOT_DIR}}/picofx ${{env.LIBS_DIR}}/lib
+        cp -v -r ${{env.BOARD_DIR}}/visible_libs/. ${{env.LIBS_DIR}}/lib
+        rm -v ${{env.LIBS_DIR}}/lib/picofx/README.md
+
+    - name: "Assemble example content"
+      shell: bash
+      run: |
+        mkdir -p ${{env.EXAMPLES_DIR}}
+        cp -v -r ${{env.EXAMPLES_DIR}}/. ${{env.EX_DIR}}
+        rm -v ${{env.EX_DIR}}/README.md
+        rm -v -r ${{env.EX_DIR}}/examples/audio/photon_sword
+        rm -v ${{env.EX_DIR}}/examples/audio/photon_sword.py
+
     - name: Libs .zip artifact
       uses: actions/upload-artifact@v4
       with:
-        name: ${{env.RELEASE_FILE}}-libs-only
-        path: picofx/picofx
+        name: ${{env.RELEASE_FILE}}-libraries-only
+        path: picofx/lib_temp
 
     - name:  Examples .zip artifact
       uses: actions/upload-artifact@v4
       with:
         name: ${{env.RELEASE_FILE}}-examples-only
-        path: "picofx/examples/${{matrix.shortname}}"
+        path: "picofx/ex_temp"
 
     - name: Libs .zip release asset
       if: github.event_name == 'release'
@@ -44,9 +66,9 @@ jobs:
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       with:
-        asset_path: picofx/picofx
+        asset_path: picofx/lib_temp
         upload_url: ${{github.event.release.upload_url}}
-        asset_name: ${{env.RELEASE_FILE}}-libs-only
+        asset_name: ${{env.RELEASE_FILE}}-libraries-only
         asset_content_type: application/octet-stream
 
     - name: Examples .zip release asset
@@ -55,7 +77,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       with:
-        asset_path: "picofx/examples/${{matrix.shortname}}"
+        asset_path: "picofx/ex_temp"
         upload_url: ${{github.event.release.upload_url}}
         asset_name: ${{env.RELEASE_FILE}}-examples-only
         asset_content_type: application/octet-stream