Merge pull request #512 from zeromq/upgrade-libzmq [skip ci]

zeromq · Nov 25, 2022 · 1c08cfd · 1c08cfd
2 parents 3ec073c + 99500f2
commit 1c08cfd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -25,8 +25,6 @@ jobs:
           - x64
         zmq_draft:
           - false
-        zmq_version:
-          - 4.3.4
         docker:
           - ""
         docker_cmd:
@@ -39,31 +37,27 @@ jobs:
             ARCH: x86
             cpp_arch: amd64_x86
             zmq_draft: false
-            zmq_version: 4.3.4
 
           # - os: windows-2022
           #   node_version: 18
           #   node_arch: x64
           #   ARCH: arm64
           #   cpp_arch: amd64_arm64
           #   zmq_draft: false
-          #   zmq_version: 4.3.4
 
           - os: macos-11
             node_version: 18
             node_arch: x64
             ARCH: x86_64
             cpp_arch: x64
             zmq_draft: false
-            zmq_version: 4.3.4
 
           - os: macos-11
             node_version: 18
             node_arch: x64
             ARCH: arm64
             cpp_arch: amd64_arm64
             zmq_draft: false
-            zmq_version: 4.3.4
 
           - os: ubuntu-22.04
             docker: node:18-alpine
@@ -73,10 +67,8 @@ jobs:
             ARCH: x64
             cpp_arch: x64
             zmq_draft: false
-            zmq_version: 4.3.4
 
     env:
-      ZMQ_VERSION: ${{ matrix.zmq_version }}
       ZMQ_DRAFT: ${{ matrix.zmq_draft }}
       ZMQ_SHARED: false
       ARCH: ${{ matrix.ARCH }}

diff --git a/script/build.ts b/script/build.ts
@@ -5,9 +5,10 @@ import {mkdir, cd, exec, find, mv} from "shelljs"
 const root = dirname(__dirname)
 
 function main() {
-  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions
-  const zmq_version = process.env.ZMQ_VERSION || "4.3.4"
-  const src_url = `https://github.com/zeromq/libzmq/releases/download/v${zmq_version}/zeromq-${zmq_version}.tar.gz`
+  const zmq_rev =
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions
+    process.env.ZMQ_VERSION || "20de92ac0a2b2b9a1869782a429df68f93c3625e"
+  const src_url = `https://github.com/zeromq/libzmq/archive/${zmq_rev}.tar.gz`
 
   const libzmq_build_prefix = `${root}/build/libzmq-staging`
   const libzmq_install_prefix = `${root}/build/libzmq`
@@ -16,8 +17,8 @@ function main() {
     process.platform === "win32" ? ".lib" : ".a"
   }`
 
-  const src_dir = `zeromq-${zmq_version}`
-  const tarball = `zeromq-${zmq_version}.tar.gz`
+  const src_dir = `libzmq-${zmq_rev}`
+  const tarball = `libzmq-${zmq_rev}.tar.gz`
 
   // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions
   const CMAKE_BUILD_TYPE = process.env.CMAKE_BUILD_TYPE || "Release"