macos and windows

Author: baileympearson

.github/docker/Dockerfile.glibc

@@ -0,0 +1,19 @@
+ARG UBUNTU_VERSION=bionic
+FROM ubuntu:${UBUNTU_VERSION} AS build
+
+ARG NODE_VERSION=16.20.1
+# Possible values: s390x, arm64, x64
+ARG NODE_ARCH
+ADD https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.gz /
+RUN mkdir -p /nodejs && tar -xzf /node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.gz --strip-components=1 -C /nodejs
+ENV PATH=$PATH:/nodejs/bin
+
+WORKDIR /zstd
+COPY . .
+
+RUN apt-get -qq update && apt-get -qq install -y python3 build-essential curl cmake && ldd --version
+
+RUN npm run install-zstd && npm install
+
+ARG RUN_TEST
+RUN [ -n "$RUN_TEST" ] && npm test || echo 'skipping testing!'

.github/docker/Dockerfile.musl

@@ -0,0 +1,14 @@
+
+ARG PLATFORM=amd64
+ARG NODE_VERSION=16.20.1
+
+FROM ${PLATFORM}/node:${NODE_VERSION}-alpine AS node
+
+WORKDIR /zstd
+COPY . .
+
+RUN apk --no-cache add make g++ libc-dev curl bash python3 py3-pip vim cmake
+RUN npm run install-zstd && npm i
+
+ARG RUN_TEST
+RUN [ -n "$RUN_TEST" ] && npm test || echo 'skipping testing!'

.github/workflows/test.yml

@@ -11,8 +11,7 @@ jobs:
   host_tests:
     strategy:
       matrix:
-        # os: [macos-latest, windows-2019]
-        os: ['ubuntu-latest']
+        os: [macos-latest, windows-2019]
         node: [16.20.1, 18.x, 20.x, 22.x]  
     runs-on: ${{ matrix.os }}
     steps:

binding.gyp

@@ -17,22 +17,45 @@
       'addon/compression.h',
       'addon/compression.cpp'
     ],
+    'conditions': [
+        [
+          'OS=="win"',
+          {
+            'link_settings': {
+              'libraries': [
+                '<(module_root_dir)/deps/zstd/build/cmake/lib/Debug/zstd_static.lib'
+              ]
+            },
+          },
+          { # macos and linux
+          'link_settings': {
+            'libraries': [
+              '<(module_root_dir)/deps/zstd/build/cmake/lib/libzstd.a',
+              ]
+            },
+          }
+        ]
+      ],
+    'cflags!': [ '-fno-exceptions' ],
+    'cflags_cc!': [ '-fno-exceptions' ],
+    'cflags_cc': ['-std=c++17'],
     'xcode_settings': {
       'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
       'CLANG_CXX_LIBRARY': 'libc++',
       'MACOSX_DEPLOYMENT_TARGET': '11',
       'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
+      'OTHER_CFLAGS': [
+          '-std=c++17',
+          '-stdlib=libc++'
+        ],
     },
-    'cflags!': [ '-fno-exceptions' ],
-    'cflags_cc!': [ '-fno-exceptions' ],
-    'cflags_cc': ['-std=c++17'],
     'msvs_settings': {
-      'VCCLCompilerTool': { 'ExceptionHandling': 1 },
-    },
-    'link_settings': {
-      'libraries': [
-        '<(module_root_dir)/deps/zstd/build/cmake/lib/libzstd.a',
-      ]
+      'VCCLCompilerTool': {
+        'ExceptionHandling': 1,
+        'AdditionalOptions': [
+          '-std:c++17'
+        ]
+      }
     },
   }]
 }

etc/install-zstd.sh

@@ -17,8 +17,10 @@ build_zstd() {
 	export MACOSX_DEPLOYMENT_TARGET=11
 	cd deps/zstd/build/cmake
 
-	cmake .
-	make
+	# CMAKE_RC_FLAGS is a workaround for a bug in 1.5.6 that breaks compilation on windows.
+	# The fix is merged but not yet released. see https://github.com/facebook/zstd/issues/3999
+	cmake -DCMAKE_RC_FLAGS="$(pwd)/lib" -DZSTD_MULTITHREAD_SUPPORT=OFF -DZSTD_BUILD_SHARED=OFF .
+	cmake --build .
 }
 
 clean_deps