From 09b570ff6670ed4f6764ccaf0f26ea5f63cde784 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Wed, 23 Jun 2021 12:36:44 +0100 Subject: [PATCH] Bump MicroPython to v1.16 * Bump MicroPython from v1.15 to v1.16 * Bump Blinka from 6.10.1 to 6.10.2 * Bump PlatformDetect from 3.13.3 to 3.14.1 * Revert backport patch/hotfix for lwip submodule --- .github/workflows/micropython-with-blinka.yml | 15 +++------------ .github/workflows/micropython.yml | 11 +---------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/.github/workflows/micropython-with-blinka.yml b/.github/workflows/micropython-with-blinka.yml index a6c4149b4..525352330 100644 --- a/.github/workflows/micropython-with-blinka.yml +++ b/.github/workflows/micropython-with-blinka.yml @@ -8,9 +8,9 @@ on: env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - MICROPYTHON_VERSION: v1.15 - BLINKA_VERSION: 6.10.1 - PLATFORMDETECT_VERSION: 3.13.3 + MICROPYTHON_VERSION: v1.16 + BLINKA_VERSION: 6.10.2 + PLATFORMDETECT_VERSION: 3.14.1 BUILD_TYPE: Release BOARD_TYPE: PICO @@ -81,15 +81,6 @@ jobs: run: | sudo apt update && sudo apt install ${{matrix.apt-packages}} - - name: Hotfix lwip submodule - shell: bash - working-directory: micropython - run: | - git config --global user.email "hotfix@example.com" - git config --global user.name "Sassy McGuffin" - wget https://github.com/micropython/micropython/commit/43e7e5f00a601b36b5b39f1fef036d6c25d5562c.patch - git am 43e7e5f00a601b36b5b39f1fef036d6c25d5562c.patch - - name: Fetch base MicroPython submodules shell: bash working-directory: micropython diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index 10dd4c980..9198dc67a 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -8,7 +8,7 @@ on: env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - MICROPYTHON_VERSION: v1.15 + MICROPYTHON_VERSION: v1.16 BUILD_TYPE: Release BOARD_TYPE: PICO @@ -47,15 +47,6 @@ jobs: run: | sudo apt update && sudo apt install ${{matrix.apt-packages}} - - name: Hotfix lwip submodule - shell: bash - working-directory: micropython - run: | - git config --global user.email "hotfix@example.com" - git config --global user.name "Sassy McGuffin" - wget https://github.com/micropython/micropython/commit/43e7e5f00a601b36b5b39f1fef036d6c25d5562c.patch - git am 43e7e5f00a601b36b5b39f1fef036d6c25d5562c.patch - - name: Fetch base MicroPython submodules shell: bash working-directory: micropython