thomas/pimoroni-pico-rp2350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Ignore non-existent with-filesystem builds.

Browse Source 
Move file rename busywork into micropython.sh.
This commit is contained in:
Phil Howard 2025-03-05 13:06:41 +00:00
parent af670449c0
commit 7a087a8567
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.github/workflows/micropython.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
env: env:
# MicroPython version will be contained in github.event.release.tag_name for releases # MicroPython version will be contained in github.event.release.tag_name for releases
RELEASE_FILE: ${{ matrix.name }}-${{ github.event.release.tag_name || github.sha }}-micropython CI_RELEASE_FILENAME: ${{ matrix.name }}-${{ github.event.release.tag_name || github.sha }}-micropython
CI_PROJECT_ROOT: ${{ github.workspace }}/src-${{ github.sha }} CI_PROJECT_ROOT: ${{ github.workspace }}/src-${{ github.sha }}
CI_BUILD_ROOT: ${{ github.workspace }} CI_BUILD_ROOT: ${{ github.workspace }}
CI_USE_ENV: 1 CI_USE_ENV: 1
@ -75,29 +75,28 @@ jobs:
python3 -m venv "$CI_BUILD_ROOT/.dir2uf2" python3 -m venv "$CI_BUILD_ROOT/.dir2uf2"
source "$CI_BUILD_ROOT/.dir2uf2/bin/activate" source "$CI_BUILD_ROOT/.dir2uf2/bin/activate"
ci_cmake_build ${{ matrix.name }} ci_cmake_build ${{ matrix.name }}
mv "$CI_BUILD_ROOT/${{ matrix.name }}.uf2" "$CI_BUILD_ROOT/$RELEASE_FILE.uf2"
mv "$CI_BUILD_ROOT/${{ matrix.name }}-with-filesystem.uf2" "$CI_BUILD_ROOT/$RELEASE_FILE-with-filesystem.uf2"
- name: "Artifacts: Upload .uf2" - name: "Artifacts: Upload .uf2"
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: ${{ env.RELEASE_FILE }}.uf2 name: ${{ env.CI_RELEASE_FILENAME }}.uf2
path: ${{ env.CI_BUILD_ROOT }}/${{ env.RELEASE_FILE }}.uf2 path: ${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}.uf2
- name: "Artifacts: Upload .uf2 (With Filesystem)"
uses: actions/upload-artifact@v4
with:
name: ${{ env.RELEASE_FILE }}-with-filesystem.uf2
path: ${{ env.CI_BUILD_ROOT }}/${{ env.RELEASE_FILE }}-with-filesystem.uf2
- name: "Release: Upload .uf2" - name: "Release: Upload .uf2"
if: github.event_name == 'release' if: github.event_name == 'release'
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v2
with: with:
files: ${{ env.CI_BUILD_ROOT }}/${{ env.RELEASE_FILE }}.uf2 files: ${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}.uf2
- name: "Artifacts: Upload .uf2 (With Filesystem)"
uses: actions/upload-artifact@v4
with:
if-no-files-found: ignore
name: ${{ env.CI_RELEASE_FILENAME }}-with-filesystem.uf2
path: ${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}-with-filesystem.uf2
- name: "Release: Upload .uf2 (With Filesystem)" - name: "Release: Upload .uf2 (With Filesystem)"
if: github.event_name == 'release' if: github.event_name == 'release'
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v2
with: with:
files: ${{ env.CI_BUILD_ROOT }}/${{ env.RELEASE_FILE }}-with-filesystem.uf2 files: ${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}-with-filesystem.uf2

12
ci/micropython.sh
View File

@ -118,12 +118,16 @@ function ci_cmake_build {
cmake --build $BUILD_DIR -j 2 cmake --build $BUILD_DIR -j 2
ccache --show-stats || true ccache --show-stats || true
log_inform "Copying .uf2 to $(pwd)/$BOARD.uf2" if [ -z ${CI_RELEASE_FILENAME+x} ]; then
cp "$BUILD_DIR/firmware.uf2" $BOARD.uf2 $CI_RELEASE_FILENAME=$BOARD
fi
log_inform "Copying .uf2 to $(pwd)/$CI_RELEASE_FILENAME.uf2"
cp "$BUILD_DIR/firmware.uf2" $CI_RELEASE_FILENAME.uf2
if [ -f "$BUILD_DIR/firmware-with-filesystem.uf2" ]; then if [ -f "$BUILD_DIR/firmware-with-filesystem.uf2" ]; then
log_inform "Copying -with-filesystem .uf2 to $(pwd)/$BOARD-with-filesystem.uf2" log_inform "Copying -with-filesystem .uf2 to $(pwd)/$CI_RELEASE_FILENAME-with-filesystem.uf2"
cp "$BUILD_DIR/firmware-with-filesystem.uf2" $BOARD-with-filesystem.uf2 cp "$BUILD_DIR/firmware-with-filesystem.uf2" $CI_RELEASE_FILENAME-with-filesystem.uf2
fi fi
} }