Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix unset matrix #106

Merged
merged 3 commits into from
Jul 16, 2024
Merged

fix unset matrix #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73a9a25
fix unset matrix
azmy60 Jul 15, 2024
1a9ad6f
fix windows workflow
azmy60 Jul 16, 2024
73cfb88
set target arch if it's defined
azmy60 Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/Electron.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading