diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 2f11e3bd..eedfb706 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -35,5 +35,7 @@ runs: if ( '${{ runner.os }}' -eq 'macOS'){ Get-ChildItem -Path build/Release Copy-Item "build/Release/edge_coreclr.node" -Destination "release/darwin/${{ inputs.arch }}/${{ inputs.node-major }}" - node-gyp clean + 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 }}" + node-gyp clean } diff --git a/.github/actions/test-build/action.yml b/.github/actions/test-build/action.yml index a8564ca8..9f88757a 100644 --- a/.github/actions/test-build/action.yml +++ b/.github/actions/test-build/action.yml @@ -69,7 +69,11 @@ runs: try { const fs = require('fs') fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/x64/${{ inputs.node }}/edge_coreclr.node', 'lib/native/darwin/x64/${{ inputs.node }}/edge_coreclr.node'); + fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/x64/${{ inputs.node }}/edge_nativeclr.node', 'lib/native/darwin/x64/${{ inputs.node }}/edge_nativeclr.node'); + fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/x64/${{ inputs.node }}/MonoEmbedding.exe', 'lib/native/darwin/x64/${{ inputs.node }}/MonoEmbedding.exe'); fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/arm64/${{ inputs.node }}/edge_coreclr.node', 'lib/native/darwin/arm64/${{ inputs.node }}/edge_coreclr.node'); + fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/arm64/${{ inputs.node }}/edge_nativeclr.node', 'lib/native/darwin/arm64/${{ inputs.node }}/edge_nativeclr.node'); + fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/arm64/${{ inputs.node }}/MonoEmbedding.exe', 'lib/native/darwin/arm64/${{ inputs.node }}/MonoEmbedding.exe'); } catch(err) { core.error("Error creating release directory") core.setFailed(err) @@ -93,12 +97,12 @@ runs: if: runner.os == 'macOS' uses: andstor/file-existence-action@v3 with: - files: "lib/native/darwin/${{ runner.arch }}/${{ inputs.node }}/edge_coreclr.node" + files: "lib/native/darwin/${{ runner.arch }}/${{ inputs.node }}/edge_coreclr.node, lib/native/darwin/${{ runner.arch }}/${{ inputs.node }}/edge_nativeclr.node" fail: true ignore_case: true - name: Run .NET 4.5 tests - if: runner.os == 'Windows' + # if: runner.os == 'Windows' shell: bash run: node tools/test.js CI diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9f2e545..6a2b5f5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,23 +43,23 @@ jobs: node: ${{ inputs.build-version }} os: ${{ matrix.os }} - # test: - # runs-on: ${{ matrix.os }} - # needs: build - # strategy: - # matrix: - # # os: [windows-2022] - # os: [windows-2022, macos-13, macos-15] - # fail-fast: false + test: + runs-on: ${{ matrix.os }} + needs: build + strategy: + matrix: + os: [macos-13, macos-14] + # os: [windows-2022, macos-13, macos-15] + fail-fast: false - # name: test node-${{ inputs.build-version }} ${{ matrix.os }} - # steps: + name: test node-${{ inputs.build-version }} ${{ matrix.os }} + steps: - # - name: Checkout code - # uses: actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v4 - # - name: Test build - # uses: ./.github/actions/test-build - # with: - # node: ${{ inputs.build-version }} - # os: ${{ matrix.os }} \ No newline at end of file + - name: Test build + uses: ./.github/actions/test-build + with: + node: ${{ inputs.build-version }} + os: ${{ matrix.os }} \ No newline at end of file diff --git a/lib/edge.js b/lib/edge.js index dd84b5fe..b8f3f634 100644 --- a/lib/edge.js +++ b/lib/edge.js @@ -28,7 +28,7 @@ else if (process.platform === 'win32') { edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + determineVersion() + '/' + (process.env.EDGE_USE_CORECLR ? 'edge_coreclr' : 'edge_nativeclr')); } else if(process.platform === 'darwin'){ - edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_coreclr.node'); + edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + (process.env.EDGE_USE_CORECLR ? 'edge_coreclr.node' : 'edge_nativeclr.node')); if(!fs.existsSync(edgeNative)){ edgeNative = builtEdge; if(!fs.existsSync(edgeNative)){