Prepare for v6

.github/workflows/build-pack-publish.yml

@@ -9,62 +9,69 @@ on:
     types: [ prereleased, released ]
 
 jobs:
-
-  build:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        os: [linux]
-        arch: [amd64, arm64, arm]
+  build-linux:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:latest
-          platforms: arm,arm64
-
-      - run: >
-          docker build .
-          --build-arg TEST_TIMEOUT_SECONDS=30
-          --tag node-bcrypt-builder
-          --platform ${{ matrix.os }}/${{ matrix.arch }}
-      - run: >
-          docker create
-          --name node-bcryptjs-builder
-          --platform ${{ matrix.os }}/${{ matrix.arch }}
-          node-bcrypt-builder
-      - run: docker cp "node-bcryptjs-builder:/usr/local/opt/bcrypt-js/prebuilds" .
-
-      # build for Alpine:
-      - run: >
-          docker build -f Dockerfile-alpine .
-          --build-arg TEST_TIMEOUT_SECONDS=30
-          --tag node-bcrypt-builder-alpine
-          --platform ${{ matrix.os }}/${{ matrix.arch }}
-      - run: >
-          docker create
-          --name node-bcryptjs-builder-alpine
-          --platform ${{ matrix.os }}/${{ matrix.arch }}
-          node-bcrypt-builder-alpine
-      - run: docker cp "node-bcryptjs-builder-alpine:/usr/local/opt/bcrypt-js/prebuilds" .
-
+      # This is unsafe, but we really don't use any other native dependencies
+      - run: npm ci
+      - run: docker run -u $(id -u):$(id -g) -v `pwd`:/input -w /input ghcr.io/prebuild/almalinux-devtoolset11 npx prebuildify --napi --tag-libc --strip --target=node@18.0.0
+      - run: docker run -u $(id -u):$(id -g) -v `pwd`:/input -w /input ghcr.io/prebuild/alpine npx prebuildify --napi --tag-libc --strip --target=node@18.0.0
+      - run: docker run -u $(id -u):$(id -g) -v `pwd`:/input -w /input ghcr.io/prebuild/linux-armv7 npx prebuildify --napi --tag-libc --strip --target=node@18.0.0
+      - run: docker run -u $(id -u):$(id -g) -v `pwd`:/input -w /input ghcr.io/prebuild/linux-armv7l-musl npx prebuildify --napi --tag-libc --strip --target=node@18.0.0
+      - run: docker run -u $(id -u):$(id -g) -v `pwd`:/input -w /input ghcr.io/prebuild/linux-arm64 npx prebuildify --napi --tag-libc --strip --target=node@18.0.0
+      - run: docker run -u $(id -u):$(id -g) -v `pwd`:/input -w /input ghcr.io/prebuild/linux-arm64-musl npx prebuildify --napi --tag-libc --strip --target=node@18.0.0
       - run: find prebuilds
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: prebuild-${{ matrix.os }}-${{ matrix.arch }}
-          path: ./prebuilds
+          name: prebuild-linux
+          path: ./prebuilds/
 
-  pack:
-    needs: build
-    runs-on: ubuntu-22.04
+  build-windows:
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: 'https://registry.npmjs.org'
       - run: npm ci
-      - uses: actions/download-artifact@v2
+      - run: npx prebuildify --napi --strip --arch=x64 --target=node@18.0.0
+      - run: npx prebuildify --napi --strip --arch=arm64 --target=node@20.0.0
+      - run: dir prebuilds
+      - uses: actions/upload-artifact@v4
+        with:
+          name: prebuild-windows
+          path: ./prebuilds/
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
+      - run: npm ci
+      - run: npx prebuildify --napi --strip --arch=arm64 --target=node@18.0.0
+      - run: npx prebuildify --napi --strip --arch=x64 --target=node@18.0.0
+      - run: find prebuilds
+      - uses: actions/upload-artifact@v4
+        with:
+          name: prebuild-macos
+          path: ./prebuilds/
+
+  pack:
+    needs:
+      - build-linux
+      - build-windows
+      - build-macos
+    runs-on: ubuntu-latest
+    outputs:
+        PACK_FILE: ${{ steps.pack.outputs.PACK_FILE }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           path: /tmp/prebuilds/
       - name: Coalesce prebuilds from build matrix
@@ -74,51 +81,30 @@ jobs:
             cp -Rav $d/* prebuilds/
           done
       - run: chmod a+x prebuilds/*/*.node && find prebuilds -executable -type f
-      - run: echo "PACK_FILE=$(npm pack)" >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v3
+      - id: pack
+        name: Prepare NPM package
+        run: |
+          echo "PACK_FILE=$(npm pack)" >> "$GITHUB_OUTPUT"
+      - uses: actions/upload-artifact@v4
         with:
           name: package-tgz
-          path: ${{ env.PACK_FILE }}
+          path: ${{ steps.pack.outputs.PACK_FILE }}
+          if-no-files-found: 'error'
 
-  publish-npm:
+  test-package:
     needs: pack
-    if: github.event_name == 'release'
-    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        node-version: [ 18, 20, 22, 23 ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: ${{ matrix.node-version }}
           registry-url: 'https://registry.npmjs.org'
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: package-tgz
-          path: /tmp/package/
-      - run: npm publish /tmp/package/bcrypt*.tgz
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-
-  publish-gpr:
-    needs: pack
-    if: github.event_name == 'release'
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          registry-url: https://npm.pkg.github.com/
-      - uses: actions/download-artifact@v2
-        with:
-          name: package-tgz
-          path: /tmp/package/
-      - run: npm publish /tmp/package/bcrypt*.tgz
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-
-
-
+      - run: npm install ${{ needs.pack.outputs.PACK_FILE }}
+      - run: node -e "const b = require('bcrypt'); const h = b.hashSync('hello', 10); console.log(h, b.compareSync('hello', h))"

.github/workflows/ci.yaml

@@ -10,25 +10,25 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18, 20]
+        node-version: [18, 20, 22]
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci
       - name: Test
         run: npm test
 
   build-alpine:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18, 20]
+        node-version: [18, 20, 22]
     container:
       image: node:${{ matrix.node-version }}-alpine
     steps:

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 6.0.0 (2025-02-28)
+  * Drop support for NodeJS <= 16
+  * Remove `node-pre-gyp` in favor of `prebuildify`, prebuilt binaries are now shipped with the package
+  * Update `node-addon-api` to 8.3.0
+  * Update JS code to newer ES syntax
+
 # 5.1.0 (2022-10-06)
   * Update `node-pre-gyp` to 1.0.11