Change structure of zips created

pimoroni · Oct 8, 2024 · 52c64d1 · 52c64d1
1 parent 4ba901f
commit 52c64d1
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/.github/workflows/filesystem.yml b/.github/workflows/filesystem.yml
@@ -19,20 +19,32 @@ jobs:
 
     env:
       RELEASE_FILE: ${{matrix.shortname}}-${{github.event.release.tag_name || github.sha}}
+      ROOT_DIR: "$GITHUB_WORKSPACE/picofx"
+      BOARD_DIR: "$GITHUB_WORKSPACE/picofx/boards/${{matrix.board}}"
+      EXAMPLES_DIR: "$GITHUB_WORKSPACE/picofx/examples/${{matrix.shortname}}"
+      FILESYSTEM_DIR: "$GITHUB_WORKSPACE/picofx/temp"
 
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
         path: picofx
 
+    - name: "Assemble lib content"
+      shell: bash
+      run: |
+        mkdir -p ${{env.FILESYSTEM_DIR}}/lib
+        cp -v -r ${{env.ROOT_DIR}}/picofx ${{env.FILESYSTEM_DIR}}/lib
+        cp -v -r ${{env.BOARD_DIR}}/visible_libs/. ${{env.FILESYSTEM_DIR}}/lib
+        rm -v ${{env.FILESYSTEM_DIR}}/lib/picofx/README.md
+
     - 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: "${{env.FILESYSTEM_DIR}}"
 
-    - name:  Examples .zip artifact
+    - name: Examples .zip artifact
       uses: actions/upload-artifact@v4
       with:
         name: ${{env.RELEASE_FILE}}-examples-only
@@ -44,9 +56,9 @@ jobs:
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       with:
-        asset_path: picofx/picofx
+        asset_path: "${{env.FILESYSTEM_DIR}}"
         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