From 252ec50f151ca0b5b698cedc4f3b19dbbdf7472e Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 23 Nov 2022 19:29:18 -0800 Subject: [PATCH 1/4] fix: update to the latest dev version of libzmq --- script/build.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/script/build.ts b/script/build.ts index cb1180b1..ef8e7f7a 100644 --- 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 || "4e193f36fc7d0f729a7c87d55fff18d8c0db5ebf" + 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" From 483aaf43d1d78764e7396add34a3450dc627cafd Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 23 Nov 2022 19:38:51 -0800 Subject: [PATCH 2/4] ci: remove the zmq_version from the CI --- .github/workflows/CI.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index cf3d6ddf..73a98605 100644 --- 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,7 +37,6 @@ jobs: ARCH: x86 cpp_arch: amd64_x86 zmq_draft: false - zmq_version: 4.3.4 # - os: windows-2022 # node_version: 18 @@ -47,7 +44,7 @@ jobs: # ARCH: arm64 # cpp_arch: amd64_arm64 # zmq_draft: false - # zmq_version: 4.3.4 + # zmq_version: "v4.3.4" - os: macos-11 node_version: 18 @@ -55,7 +52,6 @@ jobs: ARCH: x86_64 cpp_arch: x64 zmq_draft: false - zmq_version: 4.3.4 - os: macos-11 node_version: 18 @@ -63,7 +59,6 @@ jobs: ARCH: arm64 cpp_arch: amd64_arm64 zmq_draft: false - zmq_version: 4.3.4 - os: ubuntu-22.04 docker: node:18-alpine @@ -73,10 +68,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 }} From f4f73c01be6b9367707475b2cc528e210b17e7d1 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 23 Nov 2022 19:45:15 -0800 Subject: [PATCH 3/4] fix: fix the extra " --- .github/workflows/CI.yml | 1 - script/build.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 73a98605..a20fa3f9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -44,7 +44,6 @@ jobs: # ARCH: arm64 # cpp_arch: amd64_arm64 # zmq_draft: false - # zmq_version: "v4.3.4" - os: macos-11 node_version: 18 diff --git a/script/build.ts b/script/build.ts index ef8e7f7a..af86cdf8 100644 --- a/script/build.ts +++ b/script/build.ts @@ -8,7 +8,7 @@ function main() { const zmq_rev = // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions process.env.ZMQ_VERSION || "4e193f36fc7d0f729a7c87d55fff18d8c0db5ebf" - const src_url = `"https://github.com/zeromq/libzmq/archive/${zmq_rev}.tar.gz` + 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` From 99500f29fab4893b49a9abf00c23dc509ede8b4c Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 25 Nov 2022 13:10:40 -0800 Subject: [PATCH 4/4] fix: add libzmq CMake fix https://github.com/zeromq/zeromq.js/issues/529#issuecomment-1325857356 --- script/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build.ts b/script/build.ts index af86cdf8..81dce2ca 100644 --- a/script/build.ts +++ b/script/build.ts @@ -7,7 +7,7 @@ const root = dirname(__dirname) function main() { const zmq_rev = // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions - process.env.ZMQ_VERSION || "4e193f36fc7d0f729a7c87d55fff18d8c0db5ebf" + 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`