Skip to content

Commit 4ecea49

Browse files
committed
Merge branch 'main' into windows-arm
2 parents e0b7c1e + 20d0e64 commit 4ecea49

File tree

5 files changed

+2441
-2235
lines changed

5 files changed

+2441
-2235
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,46 @@ jobs:
1313
matrix:
1414
include:
1515
- name: darwin
16-
os: macos-11
16+
os: macos-latest
1717
node: x64
1818
command: prebuildify
19-
args: --arch x64+arm64 --target 14.0.0
19+
args: --arch x64+arm64
2020
- name: win32-x86
2121
os: windows-2019
2222
node: x86
2323
command: prebuildify
24-
args: --target 14.0.0
2524
- name: win32-x64
2625
os: windows-2019
2726
node: x64
2827
command: prebuildify
29-
args: --target 14.0.0
3028
- name: win32-arm64
3129
os: windows-2019
3230
command: prebuildify
33-
args: --arch arm64 --target 20.11.1
31+
args: --arch arm64
3432
- name: linux-x64
3533
os: ubuntu-latest
3634
command: prebuildify-cross
37-
args: -i centos7-devtoolset7 -i alpine --target 14.0.0
35+
args: -i centos7-devtoolset7 -i alpine
3836
- name: linux-arm
3937
os: ubuntu-latest
4038
command: prebuildify-cross
41-
args: -i linux-arm64-lts -i linux-armv7 -i linux-armv6 --target 14.0.0
39+
args: -i linux-arm64-lts -i linux-armv7 -i linux-armv7l-musl -i linux-armv6
4240
- name: android-arm
4341
os: ubuntu-latest
4442
command: prebuildify-cross
45-
args: -i android-arm64 -i android-armv7 --target 14.0.0
43+
args: -i android-arm64 -i android-armv7
4644
name: Build ${{ matrix.name }}
4745
runs-on: ${{ matrix.os }}
4846
steps:
49-
- if: matrix.os == 'macos-11'
50-
run: sudo -H pip install setuptools
5147
- if: matrix.node
52-
uses: actions/setup-node@v3
48+
uses: actions/setup-node@v4
5349
with:
54-
node-version: 18.x
50+
node-version: 20
5551
architecture: ${{ matrix.node }}
56-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
5753
- run: npm ci
5854
- run: npm run ${{ matrix.command }} -- ${{ matrix.args }}
59-
- uses: actions/upload-artifact@v3
55+
- uses: actions/upload-artifact@v4
6056
with:
6157
name: build-artifacts
6258
path: prebuilds/
@@ -68,14 +64,14 @@ jobs:
6864
name: Release
6965
runs-on: ubuntu-latest
7066
steps:
71-
- uses: actions/checkout@v3
72-
- uses: actions/download-artifact@v3
67+
- uses: actions/checkout@v4
68+
- uses: actions/download-artifact@v4
7369
with:
7470
name: build-artifacts
7571
path: prebuilds
76-
- uses: actions/setup-node@v3
72+
- uses: actions/setup-node@v4
7773
with:
78-
node-version: 18.x
74+
node-version: 20
7975
- run: npm ci
8076
- run: npm run build
8177
- run: npm run semantic-release

.github/workflows/test.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
lint:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- uses: actions/setup-node@v3
1414
with:
1515
node-version: 18.x
@@ -20,22 +20,20 @@ jobs:
2020
runs-on: ${{ matrix.config.os }}
2121
strategy:
2222
matrix:
23-
node-version: [16.x, 18.x, 20.x]
23+
node-version: [18.x, 20.x, 22.x]
2424
config:
2525
# arch isn't used and we have no way to use it currently
2626
- { os: macos-latest, arch: x64 }
2727
- { os: ubuntu-latest, arch: x64 }
2828
- { os: windows-2019, arch: x64 }
2929
steps:
30-
- if: matrix.config.os == 'macos-latest'
31-
run: sudo -H pip install setuptools
32-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3331
- uses: actions/setup-node@v3
3432
with:
3533
node-version: ${{ matrix.node-version }}
3634
- run: npm ci
3735
- run: npm run rebuild
3836
- run: npm test
39-
- uses: codecov/codecov-action@v3
37+
- uses: codecov/codecov-action@v4
4038
with:
4139
directory: ./coverage/

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.17.1
1+
20.18.0

0 commit comments

Comments
 (0)