Skip to content

Commit

Permalink
testing macOS build
Browse files Browse the repository at this point in the history
  • Loading branch information
agracio committed Mar 6, 2025
1 parent 0b4242d commit d48a6bb
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 32 deletions.
13 changes: 11 additions & 2 deletions .github/actions/build-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,17 @@ runs:

- name: Upload artifacts
uses: actions/upload-artifact@v4
if: success()
if: runner.os == 'Windows' && success()
with:
name: edge-js-${{ inputs.node }}
name: win32-edge-js-${{ inputs.node }}
path: |
release
- name: Upload artifacts
uses: actions/upload-artifact@v4
if: runner.os == 'macOS' && success()
with:
name: darwin-edge-js-${{ inputs.node }}
path: |
release
34 changes: 17 additions & 17 deletions .github/actions/setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ 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 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 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'
# 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
Expand Down
12 changes: 6 additions & 6 deletions .github/actions/test-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ runs:
using: "composite"
steps:

- name: Setup env
uses: ./.github/actions/setup-env
with:
node: ${{ inputs.node }}
os: ${{ inputs.os }}

- name: Create release folder
if: runner.os == 'Windows'
shell: pwsh
Expand Down Expand Up @@ -72,6 +66,12 @@ runs:
core.error("Error creating release directory")
core.setFailed(err)
}
- name: Setup env
uses: ./.github/actions/setup-env
with:
node: ${{ inputs.node }}
os: ${{ inputs.os }}

- name: Test
uses: ./.github/actions/test-windows
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 20
- 22
- 23
- 24

env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ on:
- '*.sln'
- '*.vcxproj'


env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true # required to setup CSC
DOTNET_CLI_TELEMETRY_OPTOUT: 1
Expand Down Expand Up @@ -104,14 +103,19 @@ jobs:
# run: |
# pip install setuptools

- if: runner.os == 'Windows'
name: Run Windows tests
uses: ./.github/actions/test-windows
with:
node: ${{ matrix.node }}
- name: Run .NET 4.5 tests
if: runner.os == 'Windows'
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 macOS|Linux tests"
name: "Run .net core tests"
run: node tools/test.js CI
env:
EDGE_USE_CORECLR: 1
Expand Down

0 comments on commit d48a6bb

Please sign in to comment.