From 99b36c22bb95699b2b66f23c28833ba2da20d2c5 Mon Sep 17 00:00:00 2001 From: agracio Date: Sun, 9 Mar 2025 16:15:20 +0000 Subject: [PATCH] testing macOS build --- .github/actions/build/action.yml | 2 +- .github/actions/setup-env/action.yml | 22 ++++++++++++++-------- .github/workflows/main.yml | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 09a2f7b0..eedfb706 100644 --- 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/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index b3347e27..fdcfa944 100644 --- a/.github/actions/setup-env/action.yml +++ b/.github/actions/setup-env/action.yml @@ -28,14 +28,14 @@ runs: path: ~/.cache/node-gyp key: '${{ inputs.os }}-${{ inputs.node}}' - # - name: Cache node-gyp macOs - # if: runner.os == 'macOS' - # uses: actions/cache@v4 - # env: - # cache-name: cache-node-gyp - # with: - # path: ~/Library/Caches/node-gyp - # key: '${{ inputs.os }}-${{ inputs.node}}' + - name: Cache node-gyp macOs + if: runner.os == 'macOS' + uses: actions/cache@v4 + env: + cache-name: cache-node-gyp + with: + path: ~/Library/Caches/node-gyp + key: '${{ inputs.os }}-${{ inputs.node}}' - name: Cache node modules @@ -52,6 +52,12 @@ runs: with: dotnet-version: '8.0.x' # SDK Version to use; x will use the latest version of the 8.0 channel + - name: Setup pkf-config + if: runner.os == 'macOS' + shell: bash + run: | + brew install pkg-config + - name: Versions shell: bash run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85f10b06..6d0f1150 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,7 +86,7 @@ jobs: # 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] + node: [20, 22] steps: - name: Checkout code