Skip to content

Commit

Permalink
Merge pull request #106 from azmy60/add-electron-build
Browse files Browse the repository at this point in the history
fix unset matrix
  • Loading branch information
carlopi authored Jul 16, 2024
2 parents 13104d4 + 73cfb88 commit ceb7348
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/Electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
osx-electron-arm64:
name: Electron OSX
runs-on: macos-14
needs: set-up-npm
needs: [set-up-npm, set-up-electron-versions]
strategy:
matrix:
version: ${{ fromJSON(needs.set-up-electron-versions.outputs.matrix) }}
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
osx-electron-x64:
name: Electron OSX
runs-on: macos-13
needs: set-up-npm
needs: [set-up-npm, set-up-electron-versions]
strategy:
matrix:
version: ${{ fromJSON(needs.set-up-electron-versions.outputs.matrix) }}
Expand Down Expand Up @@ -205,16 +205,15 @@ jobs:
ELECTRON_VERSION: ${{ matrix.version.electron }}

win-electron:
name: node.js Windows
name: Electron Windows
runs-on: windows-latest
needs: set-up-npm
needs: [set-up-npm, set-up-electron-versions]
continue-on-error: ${{ !startsWith(matrix.version.node, '18') && !startsWith(matrix.version.node, '20') && !startsWith(matrix.version.node, '21') }}
env:
npm_config_msvs_version: 2019

strategy:
matrix:
target_arch: [ arm64 ]
version: ${{ fromJSON(needs.set-up-electron-versions.outputs.matrix) }}

steps:
Expand Down
8 changes: 5 additions & 3 deletions scripts/node_build_win.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ make clean
if [ -n "$ELECTRON_VERSION" ] ; then
# Electron's version.
export npm_config_target="$ELECTRON_VERSION"
# The architecture of your machine
export npm_config_arch="$TARGET_ARCH"
export npm_config_target_arch="$TARGET_ARCH"
if [ -n "$TARGET_ARCH" ] ; then
# The architecture of your machine
export npm_config_arch="$TARGET_ARCH"
export npm_config_target_arch="$TARGET_ARCH"
fi
# Download headers for Electron.
export npm_config_disturl=https://electronjs.org/headers
# Tell node-pre-gyp that we are building for Electron.
Expand Down

0 comments on commit ceb7348

Please sign in to comment.