From cea392b9e0508fea2ecac6afa1c45193f1942feb Mon Sep 17 00:00:00 2001 From: Niklas Hauser Date: Sun, 23 Nov 2025 22:13:14 +0100 Subject: [PATCH 1/2] [ext] Update modm-devices to fix Python 3.14 compatibility --- ext/modm-devices | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/modm-devices b/ext/modm-devices index b2bed6cb40..1d4617eda5 160000 --- a/ext/modm-devices +++ b/ext/modm-devices @@ -1 +1 @@ -Subproject commit b2bed6cb40fc406b15d6e8de5caadaaa9a219b52 +Subproject commit 1d4617eda59332b268f00c455307ddc6fb6d8243 From 44e510ff456dfb69a422690400a60d3920da2005 Mon Sep 17 00:00:00 2001 From: Niklas Hauser Date: Sun, 23 Nov 2025 22:15:11 +0100 Subject: [PATCH 2/2] [ci] Upgrade macOS CI --- .github/workflows/macos.yml | 10 +++------- .../make/resources/compiler.mk.in | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 12d21160e0..47a016bd12 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,13 +8,9 @@ concurrency: jobs: macos_testing: - runs-on: macos-13 + runs-on: macos-15 steps: - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '15.2' - - name: Setup environment - Brew tap run: | brew tap osx-cross/arm @@ -62,12 +58,12 @@ jobs: - name: Hosted Unittests if: always() run: | - (cd test && make run-hosted-darwin) + (cd test && make run-hosted-darwin-arm64) - name: Hosted Examples if: always() run: | - (cd examples/linux && ../../tools/scripts/examples_compile.py block_device assert build_info etl fiber git logger printf threads) + (cd examples/linux && ../../tools/scripts/examples_compile.py block_device assert build_info fiber git logger printf threads) - name: Compile STM32 Examples if: always() diff --git a/tools/build_script_generator/make/resources/compiler.mk.in b/tools/build_script_generator/make/resources/compiler.mk.in index fe9665fb17..1f86ddd852 100644 --- a/tools/build_script_generator/make/resources/compiler.mk.in +++ b/tools/build_script_generator/make/resources/compiler.mk.in @@ -18,7 +18,7 @@ else %% if platform == "hosted" UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Darwin) - C_SUFFIX := -12 + C_SUFFIX := -14 # Using homebrew include and lib paths on macOS CPPDEFINES += -I/usr/local/include LIBPATH += -L/usr/local/lib