From acc6c23479941ec994419b729c76ad9cbd768b8a Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Tue, 17 Sep 2024 11:29:29 +0100 Subject: [PATCH 1/5] CI: Bump py_decl and dir2uf2. In both cases this incorporates fixes for better understanding and preservation of uf2 sections. Mostly for RP2350 UF2s. --- .github/workflows/micropython.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index b8837d6..1d5a1bd 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -88,14 +88,14 @@ jobs: uses: actions/checkout@v4 with: repository: gadgetoid/py_decl - ref: v0.0.2 + ref: v0.0.3 path: py_decl - name: "dir2uf2: Checkout" uses: actions/checkout@v4 with: repository: gadgetoid/dir2uf2 - ref: v0.0.7 + ref: v0.0.8 path: dir2uf2 - name: "MicroPython: Build MPY Cross" From 0137fde293cfe35e5868f952200649eb4d7abf4e Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Tue, 24 Sep 2024 10:21:36 +0100 Subject: [PATCH 2/5] CI: Produce sparse filesystem builds. --- .github/workflows/micropython.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index 1d5a1bd..1eff459 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -95,7 +95,7 @@ jobs: uses: actions/checkout@v4 with: repository: gadgetoid/dir2uf2 - ref: v0.0.8 + ref: feature/no-uf2-padding path: dir2uf2 - name: "MicroPython: Build MPY Cross" @@ -125,7 +125,7 @@ jobs: shell: bash run: | python3 -m pip install littlefs-python==0.12.0 - ./dir2uf2/dir2uf2 --fs-compact --append-to build-${{ matrix.name }}/${{ env.RELEASE_FILE }}.uf2 --manifest ${{env.USER_FS_MANIFEST}} --filename with-filesystem.uf2 ${{env.USER_FS_SOURCE}}/ + ./dir2uf2/dir2uf2 --fs-compact --sparse --append-to build-${{ matrix.name }}/${{ env.RELEASE_FILE }}.uf2 --manifest ${{env.USER_FS_MANIFEST}} --filename with-filesystem.uf2 ${{env.USER_FS_SOURCE}}/ - name: "Artifacts: Upload .uf2" uses: actions/upload-artifact@v4 From 0f48f5ac9f246375d17e5b38538b850b20cf5719 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Wed, 25 Sep 2024 16:25:33 +0100 Subject: [PATCH 3/5] CI: Enable verbose output on dir2uf2. --- .github/workflows/micropython.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index 1eff459..7dd7abe 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -125,7 +125,7 @@ jobs: shell: bash run: | python3 -m pip install littlefs-python==0.12.0 - ./dir2uf2/dir2uf2 --fs-compact --sparse --append-to build-${{ matrix.name }}/${{ env.RELEASE_FILE }}.uf2 --manifest ${{env.USER_FS_MANIFEST}} --filename with-filesystem.uf2 ${{env.USER_FS_SOURCE}}/ + ./dir2uf2/dir2uf2 --fs-compact --sparse --verbose --append-to build-${{ matrix.name }}/${{ env.RELEASE_FILE }}.uf2 --manifest ${{env.USER_FS_MANIFEST}} --filename with-filesystem.uf2 ${{env.USER_FS_SOURCE}}/ - name: "Artifacts: Upload .uf2" uses: actions/upload-artifact@v4 @@ -159,4 +159,4 @@ jobs: asset_path: ${{ env.RELEASE_FILE }}-with-filesystem.uf2 upload_url: ${{ github.event.release.upload_url }} asset_name: ${{ env.RELEASE_FILE }}-with-filesystem.uf2 - asset_content_type: application/octet-stream \ No newline at end of file + asset_content_type: application/octet-stream From f6f64bd3930fe26979ea76a6ab69edee01da3d21 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Wed, 25 Sep 2024 16:31:07 +0100 Subject: [PATCH 4/5] CI: Fix dir2uf2 filesystem path. --- .github/workflows/micropython.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index 7dd7abe..da7856e 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -36,7 +36,7 @@ jobs: PIMORONI_PICO_DIR: "${{ github.workspace }}/pimoroni-pico" USER_C_MODULES: "${{ github.workspace }}/src-${{ github.sha }}/modules/${{ matrix.modules }}.cmake" USER_FS_MANIFEST: "${{ github.workspace }}/src-${{ github.sha }}/modules/${{ matrix.modules }}.txt" - USER_FS_SOURCE: "${{ github.workspace }}/src-${{ github.sha }}/modules/littlefs" + USER_FS_SOURCE: "${{ github.workspace }}/src-${{ github.sha }}/modules/py_littlefs" TAG_OR_SHA: ${{ github.event.release.tag_name || github.sha }} MICROPY_BOARD: ${{ matrix.board }} MICROPY_BOARD_VARIANT: ${{ matrix.variant }} From 109334a2022086089e8b89a50d7c294263292ea5 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Wed, 25 Sep 2024 16:54:13 +0100 Subject: [PATCH 5/5] CI: Bump dir2uf2 to release v0.0.9. --- .github/workflows/micropython.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index da7856e..ba3e8c4 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -95,7 +95,7 @@ jobs: uses: actions/checkout@v4 with: repository: gadgetoid/dir2uf2 - ref: feature/no-uf2-padding + ref: v0.0.9 path: dir2uf2 - name: "MicroPython: Build MPY Cross"