From 1dcc67ccd1fc4162938d6efe37667656f2d8ab4b Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Tue, 27 Feb 2024 11:14:05 +0000 Subject: [PATCH] CI: Bump MicroPython to rp2-add-rp2350. CI tracking the unmerged RP2350 support branch. --- .github/workflows/micropython.yml | 3 ++- ci/micropython.sh | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index 4e4ee5adc..eda9e651d 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -7,7 +7,8 @@ on: types: [created] env: - MICROPYTHON_VERSION: v1.23.0 + MICROPYTHON_VERSION: rp2-add-rp2350 + MICROPYTHON_FLAVOUR: dpgeorge jobs: build: diff --git a/ci/micropython.sh b/ci/micropython.sh index 2f598c084..79df4b8b5 100644 --- a/ci/micropython.sh +++ b/ci/micropython.sh @@ -13,11 +13,8 @@ function log_warning { } function micropython_clone { - log_inform "Using MicroPython $MICROPYTHON_VERSION" - git clone https://github.com/micropython/micropython - cd micropython - git checkout $MICROPYTHON_VERSION - git cherry-pick -n 932f76c6ba64c5a3e68de3324556d9979f09303b + log_inform "Using MicroPython $MICROPYTHON_FLAVOUR/$MICROPYTHON_VERSION" + git clone https://github.com/$MICROPYTHON_FLAVOUR/micropython -b $MICROPYTHON_VERSION --depth=1 git submodule update --init lib/pico-sdk git submodule update --init lib/cyw43-driver git submodule update --init lib/lwip