Skip to content

Commit a5bc5cd

Browse files
saved
1 parent 7a905ca commit a5bc5cd

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

.github/docker/Dockerfile.glibc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,18 @@ WORKDIR /zstd
1212
COPY . .
1313

1414
RUN apt-get -qq update
15-
RUN apt-get -qq install -y python3 build-essential curl cmake
15+
RUN apt-get -qq install -y python3
16+
RUN apt-get -qq install -y build-essential
17+
RUN apt-get -qq install -y curl
18+
RUN apt-get -qq install -y cmake
19+
20+
RUN "PRINTING DEPENDENCY INFORMATION"
1621
RUN python3 --version
22+
RUN node --version
1723

1824
RUN npm run install-zstd
25+
26+
RUN "ZSTD INSTALLED AND BUILT."
1927
RUN npm install
2028
RUN npm run prebuild
2129

etc/install-zstd.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,20 @@ clean_deps() {
88

99
download_zstd() {
1010
mkdir -p deps/zstd
11+
12+
echo "NODE VERSION: $(node --version)"
1113
ZSTD_VERSION=$(node -p "require('./package.json')['mongodb:zstd_version']")
1214

1315
# only unpack the source and build files needed to compile the project
1416
necessary_files="zstd-$ZSTD_VERSION/build zstd-$ZSTD_VERSION/lib zstd-$ZSTD_VERSION/programs"
15-
17+
1618
# flags
1719
# -L follow redirects
1820
# -C output directory
1921
# - tar from stdin
2022
# --strip-components ignore the top-level directory when unpacking
21-
curl -L "https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz" \
22-
| tar -zxf - -C deps/zstd --strip-components 1 $necessary_files
23+
curl -L "https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz" |
24+
tar -zxf - -C deps/zstd --strip-components 1 $necessary_files
2325
}
2426

2527
build_zstd() {
@@ -37,11 +39,11 @@ build_zstd() {
3739
-DZSTD_BUILD_SHARED=OFF \
3840
-DCMAKE_OSX_ARCHITECTURES='x86_64;arm64' \
3941
-DCMAKE_BUILD_TYPE=Release \
40-
../build/cmake
42+
../build/cmake
4143

42-
cmake --build . --target libzstd_static --config Release
44+
cmake --build . --target libzstd_static --config Release
4345
}
4446

4547
clean_deps
4648
download_zstd
47-
build_zstd
49+
build_zstd

0 commit comments

Comments
 (0)