More testing, bug fixes, better CI

WilliamVenner · Jun 6, 2024 · 81330f4 · 81330f4
1 parent a388c2d
commit 81330f4
Show file tree

Hide file tree

Showing 13 changed files with 295 additions and 384 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,9 +3,9 @@ name: CI and Publish
 on:
   push:
     branches:
-      - '**'
+      - "**"
     tags:
-      - 'v*.*.*'
+      - "v*.*.*"
 
 jobs:
   build:
@@ -16,40 +16,68 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        submodules: true
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          submodules: true
 
-    - name: Set up Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: 22
-        registry-url: 'https://registry.npmjs.org/'
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 22
+          registry-url: "https://registry.npmjs.org/"
 
-    - name: Install dependencies
-      run: npm install
+      - name: Install dependencies
+        run: npm install
 
-    - name: Run tests
-      run: npm test
+      - name: Run tests
+        run: npm test
+
+  integrationtest:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 22
+          registry-url: "https://registry.npmjs.org/"
+
+      - name: Try to npm install
+        run: |
+          mkdir npm-install-test
+          cd npm-install-test
+          npm init -y
+          npm install ../ --save --install-links --foreground-scripts
+
+      - name: Run integration test
+        run: |
+          cd npm-install-test
+          cp node_modules/node-bzip2/test/integration.js integration.js
+          node integration.js
 
   publish:
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
 
-    needs: build
+    needs: [build, integrationtest]
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version: '20.x'
-        registry-url: 'https://registry.npmjs.org'
-    - run: npm ci
-    - run: npm publish --access public
-      env:
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20.x"
+          registry-url: "https://registry.npmjs.org"
+      - run: npm ci
+      - run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/binding.gyp b/binding.gyp
@@ -6,7 +6,7 @@
                 {
                     "action_name": "configure_bzip2",
                     "inputs": [],
-                    "outputs": ["<(INTERMEDIATE_DIR)/bzip2"],
+                    "outputs": ["<(INTERMEDIATE_DIR)/bzip2/bz_version.h"],
                     "action": [
                         "cmake",
                         "-S",
@@ -23,14 +23,25 @@
                 },
                 {
                     "action_name": "build_bzip2",
-                    "inputs": ["<(INTERMEDIATE_DIR)/bzip2"],
-                    "outputs": ["<(INTERMEDIATE_DIR)/bzip2/bz_version.h"],
+                    "inputs": ["<(INTERMEDIATE_DIR)/bzip2/bz_version.h"],
+                    "outputs": [],
                     "action": [
                         "cmake",
                         "--build",
                         "<(INTERMEDIATE_DIR)/bzip2",
                         "--config=Release",
                     ],
+                    "conditions": [
+                        [
+                            'OS=="win"',
+                            {
+                                "outputs": [
+                                    "<(INTERMEDIATE_DIR)/bzip2/Release/bz2_static.lib"
+                                ]
+                            },
+                            {"outputs": ["<(INTERMEDIATE_DIR)/bzip2/libbz2_static.a"]},
+                        ]
+                    ],
                 },
             ],
             "sources": ["src/node_bzip2_wrapper.cpp"],
@@ -44,11 +55,11 @@
                     "AdditionalOptions": ["/MD"],
                 }
             },
+            "xcode_settings": {"GCC_ENABLE_CPP_EXCEPTIONS": "YES"},
             "conditions": [
                 [
                     'OS=="mac"',
                     {
-                        "xcode_settings": {"GCC_ENABLE_CPP_EXCEPTIONS": "YES"},
                         "cflags": ["-mmacosx-version-min=11.0"],
                     },
                 ],