Merge branch 'master' into windows-arm

Author: aminya

.github/workflows/CI.yml

@@ -7,95 +7,82 @@ on:
 
 jobs:
   Build:
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
+    if: ${{ !contains(github.event.head_commit.message, '[skip build]') }}
     runs-on: ${{ matrix.os }}
     # prettier-ignore
-    name: ${{ matrix.os }}-${{ matrix.node_target_arch }}-${{ matrix.dockerfile }}-${{ matrix.distro }}-${{ matrix.base_image }}
+    name: ${{ matrix.os }}-${{ matrix.node_arch }}-${{ matrix.distro }}-${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-20.04
+          - ubuntu-24.04
           - windows-2019
         node_arch:
           - x64
-        node_target_arch:
-          - x64
         cpp_arch:
           - x64
-        dockerfile:
-          - ""
         distro:
           - ""
-        vm:
-          - false
-        cross_compiling:
-          - false
+        native:
+          - true
+
         include:
           - os: windows-2019
             node_arch: ia32
-            node_target_arch: ia32
             cpp_arch: amd64_x86
-            vm: false
-            cross_compiling: true
+            native: true
 
-          - os: windows-2022
-            node_arch: x64
-            node_target_arch: arm64
-            cpp_arch: amd64_arm64
-            vm: false
-            cross_compiling: true
+          # - os: windows-2022
+          #   node_arch: x64
+          #   arch: arm64
+          #   cpp_arch: amd64_arm64
 
           - os: macos-13
             node_arch: x64
-            node_target_arch: x64
             cpp_arch: x64
-            vm: false
-            cross_compiling: false
+            native: true
 
           - os: macos-14
             node_arch: arm64
-            node_target_arch: arm64
-            cpp_arch: arm64
-            vm: false
-            cross_compiling: false
+            cpp_arch: amd64_arm64
+            native: true
 
-          # Musl Alpine
+          # Ubuntu x64
           - os: ubuntu-24.04
-            dockerfile: docker/alpine.dockerfile
+            distro: ubuntu
+            platform: linux/amd64
             node_arch: x64
-            node_target_arch: x64
             cpp_arch: x64
-            vm: true
-            cross_compiling: false
+            native: false
 
-          # Debian Arm
-          - os: ubuntu-24.04
-            distro: none
-            base_image: aminya/setup-cpp-ubuntu-gcc:20.04-1.3.0
+          # Ubuntu Arm
+          - os: ubuntu-24.04-arm
+            distro: ubuntu
+            platform: linux/arm64
             node_arch: arm64
-            node_target_arch: arm64
             cpp_arch: arm64
-            vm: true
-            cross_compiling: false
+            native: false
 
-          # Musl Alpine Arm
+          # Musl Alpine
           - os: ubuntu-24.04
-            distro: none
-            base_image: aminya/setup-cpp-alpine-gcc:3.21-1.4.0-arm64
+            distro: alpine
+            platform: linux/amd64
+            node_arch: x64
+            cpp_arch: x64
+            native: false
+
+          # Musl Alpine Arm
+          - os: ubuntu-24.04-arm
+            distro: alpine
+            platform: linux/arm64
             node_arch: arm64
-            node_target_arch: arm64
             cpp_arch: arm64
-            vm: true
-            cross_compiling: false
-
-
+            native: false
 
     env:
       npm_config_arch: ${{ matrix.node_arch }}
-      npm_config_target_arch: ${{ matrix.node_target_arch }}
+      npm_config_target_arch: ${{ matrix.node_arch }}
       setup_node_arch: ${{ matrix.node_arch }}
-      cross_compiling: ${{ matrix.cross_compiling }}
     steps:
       - uses: actions/checkout@v4
 
@@ -118,8 +105,8 @@ jobs:
         shell: bash
 
       - name: Setup Cpp
-        if: ${{ !matrix.vm }}
-        uses: aminya/setup-cpp@master
+        if: ${{ matrix.native }}
+        uses: aminya/setup-cpp@v1
         with:
           vcvarsall: ${{ contains(matrix.os, 'windows') }}
           cmake: true
@@ -134,84 +121,67 @@ jobs:
           brew install gnutls autoconf automake libtool
 
       - uses: pnpm/action-setup@v4
-        if: ${{ !matrix.vm }}
-        with:
-          version: 9
+        if: ${{ matrix.native }}
 
       - name: Install Node 20
-        if: ${{ !matrix.vm }}
+        if: ${{ matrix.native }}
         uses: actions/setup-node@v4
         with:
           node-version: 20
           architecture: ${{ env.setup_node_arch }}
 
       - name: Install and Build Native
-        if: ${{ !matrix.vm }}
+        if: ${{ matrix.native }}
         run: pnpm install
 
       - name: Build JavaScript
-        if: ${{ !matrix.vm }}
+        if: ${{ matrix.native }}
         run: pnpm run build.js
 
       - name: Install Node 12
-        if: ${{ !matrix.vm && matrix.os != 'macos-14' }}
+        if: ${{ matrix.native && matrix.os != 'macos-14' }}
         uses: actions/setup-node@v4
         with:
           node-version: 12
           architecture: ${{ env.setup_node_arch }}
 
-      - name: Build Node 12 Native
-        if: ${{ !matrix.vm }}
-        run: node ./script/install.js
+      - name: Build Native
+        if: ${{ matrix.native && matrix.node_arch != 'ia32' }}
+        run: npm run build.native
+
+      - name: Build Native Windows 32
+        if: ${{ matrix.os == 'windows-2019' && matrix.node_arch == 'ia32' }}
+        run:
+          node --enable-source-maps ./node_modules/cmake-ts/build/main.js build --config win32-ia32-release
 
       - name: Use Node 20
-        if: ${{ !matrix.vm }}
+        if: ${{ matrix.native }}
         uses: actions/setup-node@v4
         with:
           node-version: 20
           architecture: ${{ env.setup_node_arch }}
 
-      - name: Prebuild Docker
-        if: ${{ matrix.dockerfile }}
+      - name: Build Docker
+        if: ${{ matrix.distro }}
+        id: build_base
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/${{ matrix.distro }}.dockerfile
+          push: false
+          load: true
+          provenance: false
+          platforms: ${{ matrix.platform }}
+          tags: zeromq:${{ matrix.distro }}-${{ matrix.node_arch }}
+
+      - name: Copy Build
+        if: ${{ matrix.distro }}
         run: |
-          docker build -t zeromq -f ${{ matrix.dockerfile }} .
-          docker create --name zeromq-temp zeromq
+          docker create --name zeromq-temp zeromq:${{ matrix.distro }}-${{ matrix.node_arch }}
           mkdir -p ./build
           docker cp zeromq-temp:/app/build ./
           docker rm -f zeromq-temp
 
-      - name: Read Installer Script
-        if: ${{ matrix.distro }}
-        id: read-installer-script
-        run: |
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "install_deps<<$EOF" >> $GITHUB_OUTPUT
-          cat ./script/install-deps.sh >> $GITHUB_OUTPUT
-          echo "$EOF" >> $GITHUB_OUTPUT
-
-      - name: Build Linux Arm64
-        if: ${{ matrix.distro }}
-        uses: uraimo/run-on-arch-action@v3.0.0
-        with:
-          arch: aarch64
-          distro: ${{ matrix.distro }}
-          base_image: ${{ matrix.base_image }}
-          githubToken: ${{ github.token }}
-          setup: |
-            mkdir -p "${PWD}/build"
-          dockerRunArgs: |
-            --volume "${PWD}/build:/build"
-          shell: /bin/bash
-          env: |
-            VCPKG_FORCE_SYSTEM_BINARIES: 1
-          install: |
-            ${{ steps.read-installer-script.outputs.install_deps }}
-
-          run: |
-            (test -f $HOME/.cpprc && . $HOME/.cpprc || true) && \
-            pnpm install && \
-            pnpm run build
-
       - name: Upload build
         uses: actions/upload-artifact@v4
         with:
@@ -220,11 +190,11 @@ jobs:
           overwrite: true
 
       - name: Lint
-        if: "${{ !matrix.vm && contains(matrix.os, 'ubuntu') }}"
+        if: "${{ contains(matrix.os, 'ubuntu') && matrix.native }}"
         run: pnpm run lint-test
 
       - name: Test
-        if: ${{ !matrix.vm }}
+        if: ${{ matrix.native }}
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
@@ -235,7 +205,7 @@ jobs:
             rm -rf ./tmp && mkdir -p ./tmp
 
       - name: Test Electron Windows/MacOS
-        if: "${{ !matrix.vm && !contains(matrix.os, 'ubuntu') }}"
+        if: "${{ !contains(matrix.os, 'ubuntu') && matrix.native }}"
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
@@ -245,7 +215,7 @@ jobs:
         continue-on-error: true
 
       - name: Test Electron Linux
-        if: "${{ !matrix.vm && contains(matrix.os, 'ubuntu') }}"
+        if: "${{ contains(matrix.os, 'ubuntu') && matrix.native }}"
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
@@ -259,35 +229,31 @@ jobs:
     runs-on: ubuntu-latest
     needs: Build
     steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: build
-          pattern: build-*
-          delete-merged: true
-
       - uses: actions/checkout@v4
 
-      - name: Place build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./build
-
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version-file: "./.nvmrc"
 
       - name: Install Pnpm
         uses: pnpm/action-setup@v4
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
         with:
-          version: 9
+          pattern: build-*
+          path: ./build-artifacts
 
-      - name: Pack Zeromq
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Merge Artifacts
         run: |
-          pnpm install
-          pnpm pack
+          pnpm exec tsx ./script/merge-artifacts.mts
+
+      - name: Pack Zeromq
+        run: pnpm pack
 
       - name: Upload Pack
         uses: actions/upload-artifact@v4
@@ -304,6 +270,9 @@ jobs:
       matrix:
         os:
           - ubuntu-24.04
+          - ubuntu-22.04
+          - ubuntu-22.04-arm
+          - ubuntu-24.04-arm
           - windows-2022
           - macos-13
         node-version:

.github/workflows/docs.yml

@@ -7,14 +7,14 @@ on:
 
 jobs:
   Docs:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
         node_version:
-          - 18
+          - 20
         node_arch:
           - x64
         cpp_arch:
@@ -55,8 +55,6 @@ jobs:
           architecture: ${{ matrix.cpp_arch }}
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: 9
 
       - name: Install Node
         uses: actions/setup-node@v4

.gitignore

@@ -29,3 +29,4 @@ compile_commands.json
 
 /smoke-test-*
 /*.tgz
+/build-artifacts