diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4457c913..ab85ab8a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -560,8 +560,7 @@ jobs: # - run: make -C tutorials/${{ matrix.example.path }} build wizard_examples_arm: - # Keep rp-ti on 24.04: Pico SDK 2.1.1 pioasm fails with GCC 15; update SDK - runs-on: ${{ matrix.group == 'rp-ti' && 'ubuntu-24.04' || 'ubuntu-latest' }} + runs-on: ubuntu-latest strategy: fail-fast: false matrix: diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index df58c036..a07469d7 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -201,8 +201,7 @@ jobs: run: make -C tutorials/${{ matrix.example.path }} build generic_examples_arm: - # Keep RP on 24.04: Pico SDK 2.1.1 pioasm fails with GCC 15; update SDK - runs-on: ${{ startsWith(matrix.example.path, 'rp/') && 'ubuntu-24.04' || 'ubuntu-latest' }} + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -245,8 +244,7 @@ jobs: run: make -C tutorials/${{ matrix.example.path }} build device_dashboard_examples_arm: - # Keep RP on 24.04: Pico SDK 2.1.1 pioasm fails with GCC 15; update SDK - runs-on: ${{ startsWith(matrix.example.path, 'rp/') && 'ubuntu-24.04' || 'ubuntu-latest' }} + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -272,8 +270,7 @@ jobs: run: make -C tutorials/${{ matrix.example.path }} build mqtt_dashboard_examples_arm: - # Pico SDK 2.1.0 pioasm fails with GCC 15; update SDK to unpin - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: diff --git a/test/pico-sdk/Makefile b/test/pico-sdk/Makefile index 458bc262..ef314b15 100644 --- a/test/pico-sdk/Makefile +++ b/test/pico-sdk/Makefile @@ -1,6 +1,6 @@ PROJECTS ?= $(wildcard ../../tutorials/pico-sdk/*-picosdk-*) SDK_PATH ?= $(realpath $(PWD))/pico-sdk -SDK_VERSION ?= 2.1.0 +SDK_VERSION ?= 2.2.0 all: $(PROJECTS) echo diff --git a/tutorials/rp/pico-rm2/Makefile b/tutorials/rp/pico-rm2/Makefile index 79e32298..efbd455f 100644 --- a/tutorials/rp/pico-rm2/Makefile +++ b/tutorials/rp/pico-rm2/Makefile @@ -31,5 +31,5 @@ clean: $(RM) build pico_sdk_import.cmake $(SDK_PATH) $(SDK_PATH): - git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@ + git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@ cd $@ && git submodule update --quiet --init diff --git a/tutorials/rp/pico-rmii/Makefile b/tutorials/rp/pico-rmii/Makefile index 79e32298..efbd455f 100644 --- a/tutorials/rp/pico-rmii/Makefile +++ b/tutorials/rp/pico-rmii/Makefile @@ -31,5 +31,5 @@ clean: $(RM) build pico_sdk_import.cmake $(SDK_PATH) $(SDK_PATH): - git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@ + git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@ cd $@ && git submodule update --quiet --init diff --git a/tutorials/rp/pico-rndis-device/Makefile b/tutorials/rp/pico-rndis-device/Makefile index 00c6e791..6e4f9df4 100644 --- a/tutorials/rp/pico-rndis-device/Makefile +++ b/tutorials/rp/pico-rndis-device/Makefile @@ -19,7 +19,7 @@ net.h: ../../mqtt/mqtt-dashboard/device/net.h cp $< $@ pico-sdk: - git clone --depth 1 -b 2.1.0 https://github.com/raspberrypi/pico-sdk $@ + git clone --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@ cd $@ && git submodule update --init clean: diff --git a/tutorials/rp/pico-rndis/Makefile b/tutorials/rp/pico-rndis/Makefile index 79e32298..efbd455f 100644 --- a/tutorials/rp/pico-rndis/Makefile +++ b/tutorials/rp/pico-rndis/Makefile @@ -31,5 +31,5 @@ clean: $(RM) build pico_sdk_import.cmake $(SDK_PATH) $(SDK_PATH): - git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@ + git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@ cd $@ && git submodule update --quiet --init diff --git a/tutorials/rp/w5500-evb-pico/Makefile b/tutorials/rp/w5500-evb-pico/Makefile index 42b9ea52..82b376f8 100644 --- a/tutorials/rp/w5500-evb-pico/Makefile +++ b/tutorials/rp/w5500-evb-pico/Makefile @@ -31,7 +31,7 @@ clean: $(RM) build pico_sdk_import.cmake $(SDK_PATH) $(SDK_PATH): - git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@ + git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@ cd $@ && git submodule update --quiet --init # Automated remote test. Requires env variable VCON_API_KEY set. See https://vcon.io/automated-firmware-tests/ diff --git a/tutorials/rp/w55rp20-evb-pico/Makefile b/tutorials/rp/w55rp20-evb-pico/Makefile index 42b9ea52..82b376f8 100644 --- a/tutorials/rp/w55rp20-evb-pico/Makefile +++ b/tutorials/rp/w55rp20-evb-pico/Makefile @@ -31,7 +31,7 @@ clean: $(RM) build pico_sdk_import.cmake $(SDK_PATH) $(SDK_PATH): - git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@ + git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@ cd $@ && git submodule update --quiet --init # Automated remote test. Requires env variable VCON_API_KEY set. See https://vcon.io/automated-firmware-tests/