testing macOS build

agracio · Mar 6, 2025 · 7e70f79 · 7e70f79
1 parent d84c10d
commit 7e70f79
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.github/actions/build-node/action.yml b/.github/actions/build-node/action.yml
@@ -81,6 +81,12 @@ runs:
               core.setFailed(err)
             }
 
+      - if: runner.os == 'macOS' && inputs.node == 16
+        shell: bash
+        name: Add missing packages for macOS NodeJs 16 
+        run: |
+          pip install setuptools
+
       - name: Cache node-gyp Windows
         if: runner.os == 'Windows'
         uses: actions/cache@v4
@@ -115,7 +121,7 @@ runs:
           arch: 'x64'
 
       - name: Build arm64
-        if: ${{ inputs.node >=20 || runner.os  == 'macOS'}}
+        if: (inputs.node >=20) || (runner.os  == 'macOS')
         uses: ./.github/actions/build
         with:
           node: ${{ steps.node-test-version.outputs.node-version }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         # os: [windows-2022]
-        os: [macos-13, macod-14]
+        os: [macos-13, macos-14]
       # fail-fast: false
 
     name: test ${{ matrix.os }}-node-${{ inputs.build-version }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -84,10 +84,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14, ubuntu-22.04, ubuntu-22.04-arm, windows-2022]
-        # os: [macos-14, windows-2022]
-        node: [18, 20, 22, 23]
-
+        # os: [macos-13, macos-14, ubuntu-22.04, ubuntu-22.04-arm, windows-2022]
+        os: [macos-14, macos-14, macos-15]
+        # node: [18, 20, 22, 23]
+        node: [20]
     steps:
 
       - name: Checkout code

diff --git a/tools/install.js b/tools/install.js
@@ -92,7 +92,7 @@ else {
 		const edjeNative = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_coreclr.node');
 		console.log(edjeNative)
 		if(fs.existsSync(edjeNative)){
-			spawn(dotnetPath, ['build', '--configuration', 'Release'], { stdio: 'inherit', cwd: path.resolve(__dirname, '..', 'lib', 'bootstrap') })
+			spawn('dotnet', ['build', '--configuration', 'Release'], { stdio: 'inherit', cwd: path.resolve(__dirname, '..', 'lib', 'bootstrap') })
 			.on('close', function() {
 				require('./checkplatform');
 			});