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.

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

Bump build dependencies #35

Merged
merged 11 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 7 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14.15.4]
os: [macos-latest, windows-latest, ubuntu-18.04]
node: [20.12.2]
os: [macos-latest, windows-latest, ubuntu-latest]
include:
- os: macos-latest
friendlyName: macOS
- os: windows-latest
friendlyName: Windows
- os: ubuntu-18.04
- os: ubuntu-latest
friendlyName: Linux
steps:
- uses: actions/checkout@v2
Expand All @@ -34,16 +34,9 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}

# This step can be removed as soon as official Windows arm64 builds are published:
# https://github.com/nodejs/build/issues/2450#issuecomment-705853342
- run: |
$NodeVersion = (node --version) -replace '^.'
$NodeFallbackVersion = "15.8.0"
& .\script\download-node-lib-win-arm64.ps1 $NodeVersion $NodeFallbackVersion
if: ${{ matrix.os == 'windows-latest' }}
name: Install Windows arm64 node.lib

- name: Install Python setup tools
run: |
python -m pip install --upgrade setuptools packaging
- name: Install and build
run: |
yarn install
Expand All @@ -57,7 +50,7 @@ jobs:
run: npm run prebuild-napi-x64
- name: Prebuild (arm64)
run: npm run prebuild-napi-arm64
if: ${{ matrix.os != 'ubuntu-18.04' }}
if: ${{ matrix.os != 'ubuntu-latest' }}
- name: Prebuild (Windows x86)
run: npm run prebuild-napi-ia32
if: ${{ matrix.os == 'windows-latest' }}
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.14.1
20.12.2
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
"homepage": "https://github.com/desktop/desktop-trampoline#readme",
"dependencies": {
"node-addon-api": "^4.3.0",
"prebuild-install": "^7.0.1"
"prebuild-install": "^7.1.2"
},
"devDependencies": {
"jest": "^27.5.0",
"node-gyp": "^8.4.1",
"prebuild": "^11.0.3",
"node-gyp": "^10.1.0",
"prebuild": "^13.0.1",
"prettier": "^2.5.1",
"split2": "^4.1.0"
},
Expand Down
36 changes: 0 additions & 36 deletions script/download-node-lib-win-arm64.ps1

This file was deleted.

Loading
Loading