Mac build tryout.

kovacsv · Feb 22, 2024 · 2f4bf60 · 2f4bf60
1 parent d4a12be
commit 2f4bf60
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/.github/workflows/native_build.yml b/.github/workflows/native_build.yml
@@ -3,17 +3,14 @@ name: Native Build
 on: [push, pull_request]
 
 jobs:
-  build:
-
+  build_win:
     runs-on: [windows-2022]
-
     strategy:
       matrix:
         toolset: [v142, v143]
         configuration: [RelWithDebInfo]
-
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Configure
@@ -25,3 +22,26 @@ jobs:
       with:
         name: OcctImportJS_Win_${{matrix.toolset}}_${{matrix.configuration}}.lib
         path: build/${{matrix.toolset}}/${{matrix.configuration}}/occt-import-js.lib
+
+  build_mac:
+    runs-on: [macos-13]
+    strategy:
+      matrix:
+        xcode: [14.2]
+        configuration: [RelWithDebInfo]
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Setup xcode
+      if: runner.os == 'macOS'
+      run: sudo xcode-select -s /Applications/Xcode_${{matrix.xcode}}.app
+    - name: Configure
+      run: cmake -B build/${{matrix.xcode}} -G "Xcode" -DCMAKE_OSX_ARCHITECTURES="x86_64"
+    - name: Build
+      run: cmake --build build/${{matrix.xcode}} --config ${{matrix.configuration}}
+    - name: Upload
+      uses: actions/upload-artifact@v3
+      with:
+        name: OcctImportJS_Mac_${{matrix.xcode}}_${{matrix.configuration}}.a
+        path: build/${{matrix.xcode}}/${{matrix.configuration}}/occt-import-js.a
diff --git a/.github/workflows/npm_publish.yml b/.github/workflows/npm_publish.yml
@@ -9,11 +9,10 @@ jobs:
   build:
     runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: '18.x'
       - run: npm install
       - run: npm publish
         env:

diff --git a/.github/workflows/wasm_build.yml b/.github/workflows/wasm_build.yml
@@ -12,13 +12,13 @@ jobs:
         os-type: [windows-2022]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Setup node.js 17.x
-      uses: actions/setup-node@v2
+    - name: Setup node.js
+      uses: actions/setup-node@v4
       with:
-        node-version: 17.x
+        node-version: 18.x
     - name: Get Emscripten
       run: ./tools/setup_emscripten_win.bat
     - name: Build WASM

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,7 @@ set (CMAKE_CONFIGURATION_TYPES Debug;Release;RelWithDebInfo;MinSizeRel)
 add_definitions (-DUNICODE -D_UNICODE)
 
 project (OcctImportJS)
+set (CMAKE_CXX_STANDARD 11)
 
 # OcctImportJS