Skip to content

Commit d38f3fb

Browse files
committed
Merge branch 'main' into remove-unused-env-vars
2 parents 666d093 + f7b91a1 commit d38f3fb

File tree

5 files changed

+636
-667
lines changed

5 files changed

+636
-667
lines changed

.github/workflows/ci.yml

+7-14
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
node: [14.15.4]
21-
os: [macos-latest, windows-latest, ubuntu-18.04]
20+
node: [20.12.2]
21+
os: [macos-latest, windows-latest, ubuntu-latest]
2222
include:
2323
- os: macos-latest
2424
friendlyName: macOS
2525
- os: windows-latest
2626
friendlyName: Windows
27-
- os: ubuntu-18.04
27+
- os: ubuntu-latest
2828
friendlyName: Linux
2929
steps:
3030
- uses: actions/checkout@v2
@@ -34,16 +34,9 @@ jobs:
3434
uses: actions/setup-node@v1
3535
with:
3636
node-version: ${{ matrix.node }}
37-
38-
# This step can be removed as soon as official Windows arm64 builds are published:
39-
# https://github.com/nodejs/build/issues/2450#issuecomment-705853342
40-
- run: |
41-
$NodeVersion = (node --version) -replace '^.'
42-
$NodeFallbackVersion = "15.8.0"
43-
& .\script\download-node-lib-win-arm64.ps1 $NodeVersion $NodeFallbackVersion
44-
if: ${{ matrix.os == 'windows-latest' }}
45-
name: Install Windows arm64 node.lib
46-
37+
- name: Install Python setup tools
38+
run: |
39+
python -m pip install --upgrade setuptools packaging
4740
- name: Install and build
4841
run: |
4942
yarn install
@@ -57,7 +50,7 @@ jobs:
5750
run: npm run prebuild-napi-x64
5851
- name: Prebuild (arm64)
5952
run: npm run prebuild-napi-arm64
60-
if: ${{ matrix.os != 'ubuntu-18.04' }}
53+
if: ${{ matrix.os != 'ubuntu-latest' }}
6154
- name: Prebuild (Windows x86)
6255
run: npm run prebuild-napi-ia32
6356
if: ${{ matrix.os == 'windows-latest' }}

.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.14.1
1+
20.12.2

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
"homepage": "https://github.com/desktop/desktop-trampoline#readme",
3232
"dependencies": {
3333
"node-addon-api": "^4.3.0",
34-
"prebuild-install": "^7.0.1"
34+
"prebuild-install": "^7.1.2"
3535
},
3636
"devDependencies": {
3737
"jest": "^27.5.0",
38-
"node-gyp": "^8.4.1",
39-
"prebuild": "^11.0.3",
38+
"node-gyp": "^10.1.0",
39+
"prebuild": "^13.0.1",
4040
"prettier": "^2.5.1",
4141
"split2": "^4.1.0"
4242
},

script/download-node-lib-win-arm64.ps1

-36
This file was deleted.

0 commit comments

Comments
 (0)