Skip to content

Commit af6783e

Browse files
authored
Merge pull request #58 from emlearn/macos-sdk-2x
Bump Mac OS in CI to 26 Tahoe
2 parents 1078572 + 3ad16c8 commit af6783e

3 files changed

Lines changed: 15 additions & 5 deletions

File tree

.github/workflows/build.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,12 @@ jobs:
186186
- uses: actions/checkout@v4
187187
with:
188188
submodules: true
189+
190+
- name: Configure XCode SDK version
191+
run: sudo xcode-select -s /Applications/Xcode_26.1.1.app/Contents/Developer
192+
189193
- name: Install OS dependencies
190-
run: brew install pkg-config libffi
194+
run: brew install pkg-config
191195
- uses: actions/setup-python@v5
192196
with:
193197
python-version: '3.10'
@@ -201,11 +205,11 @@ jobs:
201205
- name: Setup MicroPython X86
202206
working-directory: micropython
203207
run: |
204-
source tools/ci.sh && ci_unix_32bit_setup && ci_unix_standard_build
205-
mv ./ports/unix/build-standard/ ./ports/unix/build-nomodules/
208+
make -C mpy-cross CFLAGS_EXTRA=-Wno-error
209+
make -C ports/unix submodules
206210
- name: Build custom firmware with user modules, and tests. Unix/x64
207211
run: |
208-
make check_unix V=1
212+
make check_unix V=1 CFLAGS_EXTRA=-Wno-error
209213
mkdir -p ./dist/ports/macos
210214
mv ./dist/ports/unix/micropython ./dist/ports/macos/micropython
211215
- name: Build .mpy modules and run tests Unix/x64

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ $(PORT_DIR):
6767
mkdir -p $@
6868

6969
$(UNIX_MICROPYTHON): $(PORT_DIR)
70-
make -C $(MPY_DIR)/ports/unix V=1 USER_C_MODULES=$(C_MODULES_SRC_PATH) FROZEN_MANIFEST=$(MANIFEST_PATH) CFLAGS_EXTRA='-Wno-unused-function -Wno-unused-function' -j4
70+
make -C $(MPY_DIR)/ports/unix V=1 MICROPY_PY_FFI=0 USER_C_MODULES=$(C_MODULES_SRC_PATH) FROZEN_MANIFEST=$(MANIFEST_PATH) CFLAGS_EXTRA="-Wno-unused-function -Wno-unused-function ${CFLAGS_EXTRA}" -j4
7171
cp $(MPY_DIR)/ports/unix/build-standard/micropython $@
7272

7373
unix: $(UNIX_MICROPYTHON)

docs/developing.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ NOTE: Tested on Linux and Mac OS. Not tested on Windows Subsystem for Linux (WSL
6161
make check_unix
6262
```
6363

64+
If this fails to build due to compiled warnings from inside MicroPython code, try
65+
```
66+
make check_unix CFLAGS_EXTRA=-Wno-error
67+
```
68+
69+
6470
You should see each of the test functions in tests/ being ran,
6571
and then a summary at the end with something like:
6672

0 commit comments

Comments
 (0)