Skip to content

Commit 1c9b74a

Browse files
authored
fix(NODE-6237): build against glibc 2.27 (#28)
1 parent ea1f4a6 commit 1c9b74a

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

Diff for: .github/docker/Dockerfile.glibc

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
ARG NODE_BUILD_IMAGE=node:16.20.1-bullseye
2-
FROM $NODE_BUILD_IMAGE AS build
1+
FROM ubuntu:bionic AS build
2+
3+
# Possible values: s390x, arm64, x64
4+
ARG NODE_ARCH
5+
ADD https://nodejs.org/dist/v16.20.1/node-v16.20.1-linux-${NODE_ARCH}.tar.gz /
6+
RUN mkdir -p /nodejs && tar -xzf /node-v16.20.1-linux-${NODE_ARCH}.tar.gz --strip-components=1 -C /nodejs
7+
ENV PATH=$PATH:/nodejs/bin
38

49
WORKDIR /mongodb-client-encryption
510
COPY . .
611

7-
RUN npm run install:libmongocrypt
8-
RUN npm run test
12+
RUN apt-get -qq update && apt-get -qq install -y python3 build-essential && ldd --version
13+
14+
RUN npm run install:libmongocrypt && npm run test
915

1016
FROM scratch
1117

Diff for: .github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Run Buildx
5959
run: |
6060
docker buildx create --name builder --bootstrap --use
61-
docker buildx build --platform linux/${{ matrix.linux_arch }} --output type=local,dest=./prebuilds,platform-split=false -f ./.github/docker/Dockerfile.glibc .
61+
docker buildx build --platform linux/${{ matrix.linux_arch }} --build-arg NODE_ARCH=${{ matrix.linux_arch == 'amd64' && 'x64' || matrix.linux_arch }} --output type=local,dest=./prebuilds,platform-split=false -f ./.github/docker/Dockerfile.glibc .
6262
6363
- id: upload
6464
name: Upload prebuild

Diff for: .github/workflows/lint.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@v4
20-
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v3
20+
21+
- name: Use Node.js LTS
22+
uses: actions/setup-node@v4
2223
with:
23-
node-version: ${{ matrix.node-version }}
24+
node-version: 'lts/*'
2425
cache: 'npm'
26+
2527
- name: "Build libmongocrypt"
2628
shell: bash
2729
run: |
2830
npm run install:libmongocrypt
29-
31+
3032
- if: matrix.lint-target == 'c++'
3133
shell: bash
3234
run: |

Diff for: test/release.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const REQUIRED_FILES = [
2222
];
2323

2424
describe(`Release ${packFile}`, function () {
25-
this.timeout(10000);
25+
this.timeout(60000);
2626

2727
beforeEach(function () {
2828
if (process.arch !== 'x64') {

0 commit comments

Comments
 (0)