testing macOS build

agracio · Mar 9, 2025 · 0e87bcb · 0e87bcb
1 parent 0b67482
commit 0e87bcb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -33,7 +33,7 @@ runs:
           }
 
           if ( '${{ runner.os }}' -eq 'macOS'){
-            Get-ChildItem -Path build/Release
+            # Get-ChildItem -Path build/Release
             Copy-Item "build/Release/edge_coreclr.node" -Destination "release/darwin/${{ inputs.arch }}/${{ inputs.node-major }}"
             Copy-Item "build/Release/edge_nativeclr.node" -Destination "release/darwin/${{ inputs.arch }}/${{ inputs.node-major }}"
             Copy-Item "build/Release/MonoEmbedding.exe" -Destination "release/darwin/${{ inputs.arch }}/${{ inputs.node-major }}"

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -83,8 +83,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-15, ubuntu-24.04, ubuntu-24.04-arm, windows-2022]
-        # os: [macos-13, macos-15]
+        # os: [macos-13, macos-15, ubuntu-24.04, ubuntu-24.04-arm, windows-2022]
+        os: [macos-13, macos-14]
        # node: [18, 20, 22, 23]
         node: [18, 20, 22, 23]
     steps:
@@ -103,13 +103,13 @@ jobs:
       #   run: |
       #     pip install setuptools
 
-      - if:  runner.os == 'Windows'
-        name: Run .NET 4.5 tests
+      - name: Run .NET 4.5 tests
+        # if:  runner.os == 'Windows'
         shell: bash
         run: node tools/test.js CI
 
-      - if: runner.os == 'macOS' || runner.os == 'Linux'
-        name: "Run .net core tests"
+      - name: "Run .net core tests"
+        # if: runner.os == 'macOS' || runner.os == 'Linux'
         run: node tools/test.js CI
         env:
           EDGE_USE_CORECLR: 1

diff --git a/tools/install.js b/tools/install.js
@@ -90,9 +90,10 @@ else {
 	if(process.platform === 'darwin'){
 
 		const nodeVersion = process.versions.node.split(".")[0]
-		const edjeNative = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_coreclr.node');
+		const edjeNative = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_nativeclr.node');
+		const edjeNativeClr = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_coreclr.node');
 
-		if(fs.existsSync(edjeNative)){
+		if(fs.existsSync(edjeNative) && fs.existsSync(edjeNativeClr)){
 			spawn('dotnet', ['build', '--configuration', 'Release'], { stdio: 'inherit', cwd: path.resolve(__dirname, '..', 'lib', 'bootstrap') })
 			.on('close', function() {
 				require('./checkplatform');