Skip to content

Commit ab3c005

Browse files
cjyarcjyar
authored
Remove node 14, add node 20, and add arm64-linux. (#122)
1 parent 87491c3 commit ab3c005

File tree

3 files changed

+65
-79
lines changed

3 files changed

+65
-79
lines changed

‎.github/workflows/publish.yaml‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ name: Publish
88
release:
99
types:
1010
- created
11+
# workflow_dispatch is just for testing, and it won't fully work.
12+
workflow_dispatch:
13+
inputs:
14+
name:
15+
description: fake version name
16+
required: true
1117

1218
env:
1319
# hack to get dynlibs working with musl
@@ -21,39 +27,34 @@ jobs:
2127
fail-fast: false
2228
matrix:
2329
node_version:
24-
- 14
2530
- 16
2631
- 18
32+
- 20
2733
system:
2834
- os: macos-12
2935
target: x86_64-apple-darwin
30-
- os: ubuntu-22.04
36+
arch: x64
37+
- os: buildjet-2vcpu-ubuntu-2204
3138
target: x86_64-unknown-linux-gnu
39+
arch: x64
40+
- os: buildjet-4vcpu-ubuntu-2204-arm
41+
target: arm64-unknown-linux-gnu
42+
arch: arm64
3243
- os: windows-2019
3344
target: x86_64-pc-windows-msvc
34-
arch:
35-
- x64
36-
include:
37-
# only node 15+ supports arm64 natively, so we only need to build 16 for now
38-
- system:
39-
os: [self-hosted, macOS, ARM64]
40-
target: aarch64-apple-darwin
41-
node_version: 16
42-
arch: arm64
43-
- system:
44-
os: [self-hosted, macOS, ARM64]
45-
target: aarch64-apple-darwin
46-
node_version: 18
45+
arch: x64
46+
- os: [self-hosted, macOS, ARM64]
47+
target: aarch64-apple-darwin
4748
arch: arm64
4849
steps:
4950
- uses: actions/checkout@v2
5051
with:
51-
ref: ${{ github.event.release.tag_name }}
52+
ref: ${{ github.event.release.tag_name }}${{ github.ref }}
5253
- uses: c-hive/gha-yarn-cache@v1
5354
- uses: actions/[email protected]
5455
with:
5556
node-version: ${{ matrix.node_version }}
56-
architecture: ${{ matrix.arch }}
57+
architecture: ${{ matrix.system.arch }}
5758
- uses: actions-rs/toolchain@v1
5859
with:
5960
profile: minimal
@@ -75,26 +76,33 @@ jobs:
7576
cd bin-package
7677
echo "asset=$(echo *.tar.gz)" >> "$GITHUB_OUTPUT"
7778
- name: Upload release asset
78-
run: gh release upload ${{ github.event.release.tag_name }} bin-package/${{ steps.build.outputs.asset }} --clobber
79+
run: gh release upload ${{ github.event.release.tag_name }}${{ github.event.inputs.name }} bin-package/${{ steps.build.outputs.asset }} --clobber
7980
env:
8081
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8182

8283
publish-github-docker:
83-
runs-on: ubuntu-22.04
84+
runs-on: ${{ matrix.os }}
8485
container:
8586
image: node:${{ matrix.node_version }}-alpine
8687
strategy:
8788
fail-fast: false
8889
matrix:
8990
node_version:
90-
- '14'
91-
- '16'
92-
- '18'
91+
- 16
92+
- 18
93+
- 20
94+
os:
95+
- buildjet-2vcpu-ubuntu-2204
96+
- buildjet-4vcpu-ubuntu-2204-arm
9397
steps:
9498
- run: apk add build-base git python3 wget github-cli
95-
- uses: actions/checkout@v2
99+
# https://github.com/actions/runner/issues/801#issuecomment-1374967227
100+
- run: |
101+
apk add gcompat
102+
sed -i "s:ID=alpine:ID=NotpineForGHA:" /etc/os-release
103+
- uses: actions/checkout@v3
96104
with:
97-
ref: ${{ github.event.release.tag_name }}
105+
ref: ${{ github.event.release.tag_name }}${{ github.ref }}
98106
- uses: c-hive/gha-yarn-cache@v1
99107
- uses: actions-rs/toolchain@v1
100108
with:
@@ -112,11 +120,12 @@ jobs:
112120
- name: Upload release asset
113121
run: |
114122
git config --global --add safe.directory $(pwd)
115-
gh release upload ${{ github.event.release.tag_name }} bin-package/${{ steps.build.outputs.asset }} --clobber
123+
gh release upload ${{ github.event.release.tag_name }}${{ github.event.inputs.name }} bin-package/${{ steps.build.outputs.asset }} --clobber
116124
env:
117125
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118126

119127
publish-npm:
128+
if: '${{ github.event.release.tag_name }}'
120129
needs:
121130
- publish-github
122131
- publish-github-docker
@@ -128,7 +137,7 @@ jobs:
128137
- uses: c-hive/gha-yarn-cache@v1
129138
- uses: actions/[email protected]
130139
with:
131-
node-version: 14
140+
node-version: 16
132141
- uses: actions-rs/toolchain@v1
133142
with:
134143
profile: minimal

‎.github/workflows/typescript-napi-ci.yaml‎

Lines changed: 21 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,54 +17,24 @@ jobs:
1717
- stable
1818
- beta
1919
node_version:
20-
- 14
2120
- 16
2221
- 18
22+
- 20
2323
system:
2424
- os: macos-12
2525
target: x86_64-apple-darwin
26-
- os: ubuntu-22.04
26+
arch: x64
27+
- os: buildjet-2vcpu-ubuntu-2204
2728
target: x86_64-unknown-linux-gnu
29+
arch: x64
30+
- os: buildjet-4vcpu-ubuntu-2204-arm
31+
target: arm64-unknown-linux-gnu
32+
arch: arm64
2833
- os: windows-2019
2934
target: x86_64-pc-windows-msvc
30-
arch:
31-
- x64
32-
include:
33-
- system:
34-
os:
35-
- self-hosted
36-
- macOS
37-
- ARM64
38-
target: aarch64-apple-darwin
39-
node_version: 16
40-
rust_version: stable
41-
arch: arm64
42-
- system:
43-
os:
44-
- self-hosted
45-
- macOS
46-
- ARM64
47-
target: aarch64-apple-darwin
48-
node_version: 16
49-
rust_version: beta
50-
arch: arm64
51-
- system:
52-
os:
53-
- self-hosted
54-
- macOS
55-
- ARM64
56-
target: aarch64-apple-darwin
57-
node_version: 18
58-
rust_version: stable
59-
arch: arm64
60-
- system:
61-
os:
62-
- self-hosted
63-
- macOS
64-
- ARM64
65-
target: aarch64-apple-darwin
66-
node_version: 18
67-
rust_version: beta
35+
arch: x64
36+
- os: [self-hosted, macOS, ARM64]
37+
target: aarch64-apple-darwin
6838
arch: arm64
6939
fail-fast: false
7040
steps:
@@ -73,7 +43,7 @@ jobs:
7343
with:
7444
node-version: ${{ matrix.node_version }}
7545
cache: yarn
76-
architecture: ${{ matrix.arch }}
46+
architecture: ${{ matrix.system.arch }}
7747
- uses: actions-rs/toolchain@v1
7848
with:
7949
profile: minimal
@@ -94,24 +64,30 @@ jobs:
9464
delta: 0.2
9565
afterSwitchCommand: yarn install --ignore-scripts && yarn run compile
9666
accessToken: ${{ secrets.WORKFLOW_PAT }}
67+
9768
test-docker:
9869
runs-on: ${{ matrix.os }}
70+
container:
71+
image: node:${{ matrix.node_version }}-alpine
9972
strategy:
10073
matrix:
10174
rust_version:
10275
- stable
10376
- beta
10477
node_version:
105-
- 14
10678
- 16
10779
- 18
108-
arch:
109-
- x64
80+
- 20
11081
os:
111-
- ubuntu-22.04
82+
- buildjet-2vcpu-ubuntu-2204
83+
- buildjet-4vcpu-ubuntu-2204-arm
11284
fail-fast: false
11385
steps:
11486
- run: apk add build-base git python3 wget
87+
# https://github.com/actions/runner/issues/801#issuecomment-1374967227
88+
- run: |
89+
apk add gcompat
90+
sed -i "s:ID=alpine:ID=NotpineForGHA:" /etc/os-release
11591
- run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}"
11692
- uses: actions/checkout@v3
11793
- uses: actions-rs/toolchain@v1
@@ -125,5 +101,3 @@ jobs:
125101
run: yarn run compile
126102
- name: Run tests
127103
run: yarn run test
128-
container:
129-
image: node:${{ matrix.node_version }}-alpine

‎README.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ This library uses the [Neon Bindings](https://www.neon-bindings.com) toolchain t
99

1010
## Supported Platforms
1111

12-
| | Node 14 | Node 16 | Node 18 |
13-
| --------------------- | ------- | ------- | ------- |
14-
| Linux x64 - glibc | ✓ | ✓ | ✓ |
15-
| Linux x64 - musl-libc | ✓ | ✓ | ✓ |
16-
| OSX x64 | ✓ | ✓ | ✓ |
17-
| Windows x64 | ✓ | ✓ | ✓ |
12+
| | Node 16 | Node 18 | Node 20 |
13+
| ----------------------- | ------- | ------- | ------- |
14+
| Linux x64 - glibc | ✓ | ✓ | ✓ |
15+
| Linux x64 - musl-libc | ✓ | ✓ | ✓ |
16+
| Linux arm64 - glibc | ✓ | ✓ | ✓ |
17+
| Linux arm64 - musl-libc | ✓ | ✓ | ✓ |
18+
| OSX x64 | ✓ | ✓ | ✓ |
19+
| OSX arm64 | ✓ | ✓ | ✓ |
20+
| Windows x64 | ✓ | ✓ | ✓ |
1821

1922
## Install
2023

0 commit comments

Comments
 (0)