From 3c30baaabb6f1880dc94b51db94d2094e0808787 Mon Sep 17 00:00:00 2001 From: Scott Brust Date: Mon, 14 Aug 2023 15:48:31 -0700 Subject: [PATCH 1/2] [circleci] bump macos xcode version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8fa21bd633..4d1eb17e2a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,7 +104,7 @@ jobs: platform: << parameters.platform >> build-for-darwin: macos: - xcode: "13.2.1" + xcode: "14.2" parameters: tasks: type: string From 73a38fc685668ce54b941ca7f9420ce2be02e8a4 Mon Sep 17 00:00:00 2001 From: Scott Brust Date: Mon, 14 Aug 2023 16:19:42 -0700 Subject: [PATCH 2/2] [msom] include prebootloader in build system --- build/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/release.sh b/build/release.sh index 2d17aef94d..7b0c5e53ab 100755 --- a/build/release.sh +++ b/build/release.sh @@ -407,7 +407,7 @@ eval $MAKE_COMMAND release_binary "bootloader" "bootloader" "$SUFFIX" "$DEBUG_BUILD" "$USE_SWD_JTAG" # Prebootloader -if [ $PLATFORM_ID -eq 28 ] || [ $PLATFORM_ID -eq 32 ]; then +if [ $PLATFORM_ID -eq 28 ] || [ $PLATFORM_ID -eq 32 ] || [ $PLATFORM_ID -eq 35 ]; then cd ../bootloader/prebootloader COMPILE_LTO="n"