Skip to content

Commit 2f4bf60

Browse files
committed
Mac build tryout.
1 parent d4a12be commit 2f4bf60

File tree

4 files changed

+33
-13
lines changed

4 files changed

+33
-13
lines changed

.github/workflows/native_build.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@ name: Native Build
33
on: [push, pull_request]
44

55
jobs:
6-
build:
7-
6+
build_win:
87
runs-on: [windows-2022]
9-
108
strategy:
119
matrix:
1210
toolset: [v142, v143]
1311
configuration: [RelWithDebInfo]
14-
1512
steps:
16-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1714
with:
1815
submodules: true
1916
- name: Configure
@@ -25,3 +22,26 @@ jobs:
2522
with:
2623
name: OcctImportJS_Win_${{matrix.toolset}}_${{matrix.configuration}}.lib
2724
path: build/${{matrix.toolset}}/${{matrix.configuration}}/occt-import-js.lib
25+
26+
build_mac:
27+
runs-on: [macos-13]
28+
strategy:
29+
matrix:
30+
xcode: [14.2]
31+
configuration: [RelWithDebInfo]
32+
steps:
33+
- uses: actions/checkout@v4
34+
with:
35+
submodules: true
36+
- name: Setup xcode
37+
if: runner.os == 'macOS'
38+
run: sudo xcode-select -s /Applications/Xcode_${{matrix.xcode}}.app
39+
- name: Configure
40+
run: cmake -B build/${{matrix.xcode}} -G "Xcode" -DCMAKE_OSX_ARCHITECTURES="x86_64"
41+
- name: Build
42+
run: cmake --build build/${{matrix.xcode}} --config ${{matrix.configuration}}
43+
- name: Upload
44+
uses: actions/upload-artifact@v3
45+
with:
46+
name: OcctImportJS_Mac_${{matrix.xcode}}_${{matrix.configuration}}.a
47+
path: build/${{matrix.xcode}}/${{matrix.configuration}}/occt-import-js.a

.github/workflows/npm_publish.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ jobs:
99
build:
1010
runs-on: windows-2022
1111
steps:
12-
- uses: actions/checkout@v2
13-
- uses: actions/setup-node@v2
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-node@v4
1414
with:
15-
node-version: '16.x'
16-
registry-url: 'https://registry.npmjs.org'
15+
node-version: '18.x'
1716
- run: npm install
1817
- run: npm publish
1918
env:

.github/workflows/wasm_build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
os-type: [windows-2022]
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
with:
1717
submodules: true
18-
- name: Setup node.js 17.x
19-
uses: actions/setup-node@v2
18+
- name: Setup node.js
19+
uses: actions/setup-node@v4
2020
with:
21-
node-version: 17.x
21+
node-version: 18.x
2222
- name: Get Emscripten
2323
run: ./tools/setup_emscripten_win.bat
2424
- name: Build WASM

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ set (CMAKE_CONFIGURATION_TYPES Debug;Release;RelWithDebInfo;MinSizeRel)
66
add_definitions (-DUNICODE -D_UNICODE)
77

88
project (OcctImportJS)
9+
set (CMAKE_CXX_STANDARD 11)
910

1011
# OcctImportJS
1112

0 commit comments

Comments
 (0)