From 6eef96d9c9bcd8e84aad2dc13f2633d9b72a83a8 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Thu, 6 Jun 2024 18:24:25 +0100 Subject: [PATCH 1/2] CI: Revert to v1.23.0. We'd moved past v1.23.0 to do our release in order to grab: https://github.com/micropython/micropython/commit/932f76c6ba64c5a3e68de3324556d9979f09303b But this broke our builds due to: https://github.com/micropython/micropython/issues/15220 --- .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 070d5fb53..027558d63 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -7,7 +7,7 @@ on: types: [created] env: - MICROPYTHON_VERSION: 932f76c6ba64c5a3e68de3324556d9979f09303b + MICROPYTHON_VERSION: v1.23.0 jobs: build: From 48f2446f6cb6ab4c113ccce6a0083001ec71deb6 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Thu, 6 Jun 2024 18:55:40 +0100 Subject: [PATCH 2/2] CI: Cherry-pick our pins.csv patch. --- ci/micropython.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/micropython.sh b/ci/micropython.sh index 787e29296..c6887407a 100644 --- a/ci/micropython.sh +++ b/ci/micropython.sh @@ -17,6 +17,7 @@ function micropython_clone { git clone https://github.com/micropython/micropython cd micropython git checkout $MICROPYTHON_VERSION + git cherry-pick -n 932f76c6ba64c5a3e68de3324556d9979f09303b git submodule update --init lib/pico-sdk git submodule update --init lib/cyw43-driver git submodule update --init lib/lwip @@ -73,4 +74,4 @@ function cmake_build { ccache --show-stats || true cd build-$BOARD_NAME cp firmware.uf2 $RELEASE_FILE.uf2 -} \ No newline at end of file +}