Skip to content

Commit 1007844

Browse files
baileympearsonbaileympearson
committed
maybe?
1 parent ff7b701 commit 1007844

File tree

2 files changed

+84
-83
lines changed

2 files changed

+84
-83
lines changed

‎.github/workflows/test.yml

Lines changed: 79 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [macos-latest, windows-2019, macos-13]
15-
node: [16.20.1, 18.x, 20.x, 22.x]
15+
node: [16.20.1]
16+
# node: [16.20.1, 18.x, 20.x, 22.x]
1617
fail-fast: false
1718
runs-on: ${{ matrix.os }}
1819
steps:
@@ -36,80 +37,80 @@ jobs:
3637
shell: bash
3738
run: npm test
3839

39-
container_tests_glibc:
40-
runs-on: ubuntu-latest
41-
strategy:
42-
matrix:
43-
linux_arch: [s390x, arm64, amd64]
44-
node: [16.x, 18.x, 20.x, 22.x]
45-
fail-fast: false
46-
steps:
47-
- uses: actions/checkout@v4
48-
49-
- uses: actions/setup-node@v4
50-
with:
51-
node-version: ${{ matrix.node }}
52-
53-
- name: Get Full Node.js Version
54-
id: get_nodejs_version
55-
shell: bash
56-
run: |
57-
echo "version=$(node --print 'process.version.slice(1)')" >> "$GITHUB_OUTPUT"
58-
echo "ubuntu_version=$(node --print '(+process.version.slice(1).split(`.`).at(0)) > 16 ? `noble` : `bionic`')" >> "$GITHUB_OUTPUT"
59-
60-
- name: Set up QEMU
61-
uses: docker/setup-qemu-action@v3
62-
63-
- name: Set up Docker Buildx
64-
uses: docker/setup-buildx-action@v3
65-
66-
- name: Run Buildx
67-
run: |
68-
docker buildx create --name builder --bootstrap --use
69-
docker buildx build \
70-
--platform linux/${{ matrix.linux_arch }} \
71-
--build-arg="NODE_ARCH=${{ matrix.linux_arch == 'amd64' && 'x64' || matrix.linux_arch }}" \
72-
--build-arg="NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }}" \
73-
--build-arg="UBUNTU_VERSION=${{ steps.get_nodejs_version.outputs.ubuntu_version }}" \
74-
--build-arg="RUN_TEST=true" \
75-
--output type=local,dest=./prebuilds,platform-split=false \
76-
-f ./.github/docker/Dockerfile.glibc \
77-
.
78-
79-
container_tests_musl:
80-
runs-on: ubuntu-latest
81-
strategy:
82-
matrix:
83-
linux_arch: [amd64, arm64]
84-
node: [16.20.1, 18.x, 20.x, 22.x]
85-
fail-fast: false
86-
steps:
87-
- uses: actions/checkout@v4
88-
89-
- uses: actions/setup-node@v4
90-
with:
91-
node-version: ${{ matrix.node }}
92-
93-
- name: Get Full Node.js Version
94-
id: get_nodejs_version
95-
shell: bash
96-
run: |
97-
echo "version=$(node --print 'process.version.slice(1)')" >> "$GITHUB_OUTPUT"
98-
99-
- name: Set up QEMU
100-
uses: docker/setup-qemu-action@v3
101-
102-
- name: Set up Docker Buildx
103-
uses: docker/setup-buildx-action@v3
104-
105-
- name: Run Buildx
106-
run: |
107-
docker buildx create --name builder --bootstrap --use
108-
docker --debug buildx build --progress=plain --no-cache \
109-
--platform linux/${{ matrix.linux_arch }} \
110-
--build-arg="PLATFORM=${{ matrix.linux_arch == 'arm64' && 'arm64v8' || matrix.linux_arch }}" \
111-
--build-arg="NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }}" \
112-
--build-arg="RUN_TEST=true" \
113-
--output type=local,dest=./prebuilds,platform-split=false \
114-
-f ./.github/docker/Dockerfile.musl \
115-
.
40+
# container_tests_glibc:
41+
# runs-on: ubuntu-latest
42+
# strategy:
43+
# matrix:
44+
# linux_arch: [s390x, arm64, amd64]
45+
# node: [16.x, 18.x, 20.x, 22.x]
46+
# fail-fast: false
47+
# steps:
48+
# - uses: actions/checkout@v4
49+
50+
# - uses: actions/setup-node@v4
51+
# with:
52+
# node-version: ${{ matrix.node }}
53+
54+
# - name: Get Full Node.js Version
55+
# id: get_nodejs_version
56+
# shell: bash
57+
# run: |
58+
# echo "version=$(node --print 'process.version.slice(1)')" >> "$GITHUB_OUTPUT"
59+
# echo "ubuntu_version=$(node --print '(+process.version.slice(1).split(`.`).at(0)) > 16 ? `noble` : `bionic`')" >> "$GITHUB_OUTPUT"
60+
61+
# - name: Set up QEMU
62+
# uses: docker/setup-qemu-action@v3
63+
64+
# - name: Set up Docker Buildx
65+
# uses: docker/setup-buildx-action@v3
66+
67+
# - name: Run Buildx
68+
# run: |
69+
# docker buildx create --name builder --bootstrap --use
70+
# docker buildx build \
71+
# --platform linux/${{ matrix.linux_arch }} \
72+
# --build-arg="NODE_ARCH=${{ matrix.linux_arch == 'amd64' && 'x64' || matrix.linux_arch }}" \
73+
# --build-arg="NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }}" \
74+
# --build-arg="UBUNTU_VERSION=${{ steps.get_nodejs_version.outputs.ubuntu_version }}" \
75+
# --build-arg="RUN_TEST=true" \
76+
# --output type=local,dest=./prebuilds,platform-split=false \
77+
# -f ./.github/docker/Dockerfile.glibc \
78+
# .
79+
80+
# container_tests_musl:
81+
# runs-on: ubuntu-latest
82+
# strategy:
83+
# matrix:
84+
# linux_arch: [amd64, arm64]
85+
# node: [16.20.1, 18.x, 20.x, 22.x]
86+
# fail-fast: false
87+
# steps:
88+
# - uses: actions/checkout@v4
89+
90+
# - uses: actions/setup-node@v4
91+
# with:
92+
# node-version: ${{ matrix.node }}
93+
94+
# - name: Get Full Node.js Version
95+
# id: get_nodejs_version
96+
# shell: bash
97+
# run: |
98+
# echo "version=$(node --print 'process.version.slice(1)')" >> "$GITHUB_OUTPUT"
99+
100+
# - name: Set up QEMU
101+
# uses: docker/setup-qemu-action@v3
102+
103+
# - name: Set up Docker Buildx
104+
# uses: docker/setup-buildx-action@v3
105+
106+
# - name: Run Buildx
107+
# run: |
108+
# docker buildx create --name builder --bootstrap --use
109+
# docker --debug buildx build --progress=plain --no-cache \
110+
# --platform linux/${{ matrix.linux_arch }} \
111+
# --build-arg="PLATFORM=${{ matrix.linux_arch == 'arm64' && 'arm64v8' || matrix.linux_arch }}" \
112+
# --build-arg="NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }}" \
113+
# --build-arg="RUN_TEST=true" \
114+
# --output type=local,dest=./prebuilds,platform-split=false \
115+
# -f ./.github/docker/Dockerfile.musl \
116+
# .

‎binding.gyp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
'target_name': 'zstd',
44
'type': 'loadable_module',
55
'defines': ['ZSTD_STATIC_LINKING_ONLY'],
6-
'include_dirs': [
7-
"<!(node -p \"require('node-addon-api').include_dir\")",
8-
"<(module_root_dir)/deps/zstd/lib",
9-
],
106
'variables': {
117
'ARCH': '<(host_arch)',
128
'built_with_electron%': 0
@@ -36,7 +32,11 @@
3632
'<(module_root_dir)/deps/zstd/build/cmake/lib/libzstd.a',
3733
]
3834
},
39-
}
35+
},
36+
'include_dirs': [
37+
"<!(node -p \"require('node-addon-api').include_dir\")",
38+
"<(module_root_dir)/deps/zstd/lib",
39+
],
4040
],
4141
['OS=="mac"', {
4242
'xcode_settings': {

0 commit comments

Comments
 (0)