testing macOS build

.circleci/config.yml

@@ -108,6 +108,6 @@ workflows:
           matrix:
             parameters:
               # os: ['linux', 'linux-arm', 'macos']
-              os: ['linux-arm']
+              os: ['linux', 'linux-arm']
               node-version: ['14', '16' ,'18', '20', '22', '23']
 

.github/actions/build-node/action.yml

@@ -17,7 +17,7 @@ runs:
         uses: ./.github/actions/setup-env
         with:
           node: 20
-          os: ${{ inputs.runs-on }}
+          os: ${{ inputs.os }}
 
       - name: Get latest Node.js version for v${{ inputs.node }}
         id: node-test-version

.github/actions/setup-env/action.yml

@@ -19,14 +19,14 @@ runs:
         cache: 'npm'
         cache-dependency-path: package-lock.json
 
-    # - name: Cache node-gyp Linux
-    #   if: runner.os == 'Linux'
-    #   uses: actions/cache@v4
-    #   env:
-    #     cache-name: cache-node-gyp
-    #   with:
-    #     path: ~/.cache/node-gyp
-    #     key: '${{ inputs.os }}-${{ inputs.node}}'
+    - name: Cache node-gyp Linux
+      if: runner.os == 'Linux'
+      uses: actions/cache@v4
+      env:
+        cache-name: cache-node-gyp
+      with:
+        path: ~/.cache/node-gyp
+        key: '${{ inputs.os }}-${{ inputs.node}}'
 
     # - name: Cache node-gyp macOs
     #   if: runner.os == 'macOS'

.github/workflows/build-all.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     name: build node-16
     steps:
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     name: build node-18
     steps:
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     name: build node-20
     steps:
@@ -72,7 +72,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     name: build node-22
     steps:
@@ -90,7 +90,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     name: build node-23
     steps:
@@ -108,7 +108,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     needs: build-16
 
@@ -128,7 +128,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     needs: build-18
 
@@ -148,7 +148,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     needs: build-20
 
@@ -168,7 +168,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     needs: build-22
 
@@ -188,7 +188,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-       os: [windows-2022]
+       os: [windows-2022, macos-15]
     runs-on: ${{ matrix.os }}
     needs: build-23
 

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         # os: [windows-2022, macos-14]
-        os: [macos-15]
+        os: [windows-2022, macos-15]
       fail-fast: true
 
     name: build node-${{ inputs.build-version }} ${{ matrix.os }}
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         # os: [windows-2022]
-        os: [macos-13, macos-15]
+        os: [windows-2022, macos-13, macos-15]
       fail-fast: false
 
     name: test ${{ matrix.os }}-node-${{ inputs.build-version }}

.github/workflows/main.yml

@@ -83,11 +83,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [macos-13, macos-14, ubuntu-22.04, ubuntu-22.04-arm, windows-2022]
-        # os: [macos-13, macos-14]
-        os: [macos-13, macos-15, ubuntu-24.04, ubuntu-24.04-arm]
+        os: [macos-13, macos-15, ubuntu-24.04, ubuntu-24.04-arm, windows-2022]
+        # os: [macos-13, macos-15]
        # node: [18, 20, 22, 23]
-        node: [16,18,20,22,23]
+        node: [18, 20, 22, 23]
     steps:
 
       - name: Checkout code
@@ -104,17 +103,11 @@ jobs:
       #   run: |
       #     pip install setuptools
 
-      - name: Run .NET 4.5 tests
-        if:  runner.os == 'Windows'
+      - if:  runner.os == 'Windows'
+        name: Run .NET 4.5 tests
         shell: bash
         run: node tools/test.js CI
 
-      # - if: runner.os == 'Windows'
-      #   name: Run Windows tests
-      #   uses: ./.github/actions/test-windows
-      #   with:
-      #     node: ${{ matrix.node }}
-
       - if: runner.os == 'macOS' || runner.os == 'Linux'
         name: "Run .net core tests"
         run: node tools/test.js CI

lib/edge.js

@@ -54,7 +54,7 @@ if (process.env.EDGE_USE_CORECLR && !process.env.EDGE_BOOTSTRAP_DIR && fs.exists
 }
 
 process.env.EDGE_NATIVE = edgeNative;
-console.log('edgeNative', edgeNative)
+//console.log('edgeNative', edgeNative)
 edge = require(edgeNative);
 
 exports.func = function(language, options) {

tools/install.js

@@ -88,9 +88,10 @@ if (process.platform === 'win32') {
 
 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');
-		console.log(edjeNative)
+
 		if(fs.existsSync(edjeNative)){
 			spawn('dotnet', ['build', '--configuration', 'Release'], { stdio: 'inherit', cwd: path.resolve(__dirname, '..', 'lib', 'bootstrap') })
 			.on('close', function() {