diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index 704d4032..1c7cb5fc 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -97,6 +97,7 @@ jobs: shell: bash run: | source $BUILD_TOOLS + micropython_version cmake_configure - name: Build MicroPython diff --git a/ci/micropython.sh b/ci/micropython.sh index c52b4b7f..919c74a5 100644 --- a/ci/micropython.sh +++ b/ci/micropython.sh @@ -41,8 +41,8 @@ function clone_pimoroni_pico { } function micropython_version { - echo "MICROPY_GIT_TAG=\"$MICROPYTHON_VERSION, $BOARD_NAME $TAG_OR_SHA\"" >> $GITHUB_ENV - echo "MICROPY_GIT_HASH=\"$MICROPYTHON_VERSION-$TAG_OR_SHA\"" >> $GITHUB_ENV + echo "MICROPY_GIT_TAG=$MICROPYTHON_VERSION, $BOARD_NAME $TAG_OR_SHA" >> $GITHUB_ENV + echo "MICROPY_GIT_HASH=$MICROPYTHON_VERSION-$TAG_OR_SHA" >> $GITHUB_ENV } function hack_patch_micropython_disable_exceptions { diff --git a/micropython/board/pico-sdk-patch.sh b/micropython/board/pico-sdk-patch.sh index eb2ea42e..15135a07 100755 --- a/micropython/board/pico-sdk-patch.sh +++ b/micropython/board/pico-sdk-patch.sh @@ -7,4 +7,6 @@ if [[ -f "$FIXUP_DIR/$BOARD/pico_sdk.patch" ]]; then echo "Applying pico_sdk.patch" cd $MPY_DIR/lib/pico-sdk git apply "$FIXUP_DIR/$BOARD/pico_sdk.patch" +else + echo "Skipping patch. $FIXUP_DIR/$BOARD/pico_sdk.patch not found!" fi \ No newline at end of file