Skip to content

Commit

Permalink
Revert "chore(NODE-6603): set errexit in install script and download …
Browse files Browse the repository at this point in the history
…prebuilt windows zstd (#51)"

This reverts commit 0063c4e.
  • Loading branch information
baileympearson committed Dec 4, 2024
1 parent 0063c4e commit 7cde85d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
run: npm run install-zstd
shell: bash

- name: install dependencies and compile
- name: install dependencies and compmile
run: npm install --loglevel verbose
shell: bash

Expand Down
5 changes: 1 addition & 4 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@
{
'link_settings': {
'libraries': [
'<(module_root_dir)/deps/zstd/static/zstd_static.lib'
'<(module_root_dir)/deps/zstd/build/cmake/lib/Debug/zstd_static.lib'
]
},
'include_dirs': [
'<(module_root_dir)/deps/zstd/include'
],
},
{ # macos and linux
'link_settings': {
Expand Down
27 changes: 2 additions & 25 deletions etc/install-zstd.sh
Original file line number Diff line number Diff line change
@@ -1,39 +1,16 @@
#!/bin/sh
set -o xtrace
set -o errexit

clean_deps() {
rm -rf deps
}

download_windows() {
# windows does not support symlinks, so we must download the `win64` build specifically
curl -L -o zstd.zip "https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-v$ZSTD_VERSION-win64.zip"
# unlike tar, unzip does not have a "strip components" option. so we unzip the file, copy all the contents to the correct location,
# and then delete both the .zip and the unziped content.
unzip zstd.zip
cp -r zstd-v$ZSTD_VERSION-win64/* deps/zstd
rm zstd.zip
rm -rf zstd-v$ZSTD_VERSION-win64
}

download_zstd() {
mkdir -p deps/zstd
ZSTD_VERSION=$(node -p "require('./package.json')['mongodb:zstd_version']")
is_windows=$(node -p "process.platform === 'win32'")

if [ "$is_windows" == "true" ]; then
download_windows
exit 0 # no need to build windows
else
# tar flags
# -C specifies the output location
# --strip-components removes one level of directory nesting
# curl flags
# -L follows redirects
curl -L "https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz" \
| tar -zxf - -C deps/zstd --strip-components 1
fi
curl -L "https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz" \
| tar -zxf - -C deps/zstd --strip-components 1
}

build_zstd() {
Expand Down

0 comments on commit 7cde85d

Please sign in to comment.