Skip to content

Commit 6e5940b

Browse files
committed
[ci] Upgrade macOS CI
1 parent 584f5e3 commit 6e5940b

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/macos.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@ concurrency:
88

99
jobs:
1010
macos_testing:
11-
runs-on: macos-13
11+
runs-on: macos-14
1212

1313
steps:
14-
- uses: maxim-lobanov/setup-xcode@v1
15-
with:
16-
xcode-version: '15.2'
17-
1814
- name: Setup environment - Brew tap
1915
run: |
2016
brew tap osx-cross/arm
@@ -62,7 +58,7 @@ jobs:
6258
- name: Hosted Unittests
6359
if: always()
6460
run: |
65-
(cd test && make run-hosted-darwin)
61+
(cd test && make run-hosted-darwin-arm64)
6662
6763
- name: Hosted Examples
6864
if: always()

examples/linux/etl/project.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<library>
22
<!-- CI: run fail -->
3+
<!-- CI: enable "Darwin" not in platform.platform() -->
34
<options>
45
<option name="modm:target">hosted-linux</option>
56
<option name="modm:build:build.path">../../../build/linux/etl</option>

tools/build_script_generator/make/resources/compiler.mk.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
%% if platform == "hosted"
1919
UNAME_S := $(shell uname -s)
2020
ifeq ($(UNAME_S),Darwin)
21-
C_SUFFIX := -12
21+
C_SUFFIX := -14
2222
# Using homebrew include and lib paths on macOS
2323
CPPDEFINES += -I/usr/local/include
2424
LIBPATH += -L/usr/local/lib

0 commit comments

Comments
 (0)