Skip to content

Commit 1c08cfd

Browse files
authored
Merge pull request #512 from zeromq/upgrade-libzmq [skip ci]
2 parents 3ec073c + 99500f2 commit 1c08cfd

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

.github/workflows/CI.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ jobs:
2525
- x64
2626
zmq_draft:
2727
- false
28-
zmq_version:
29-
- 4.3.4
3028
docker:
3129
- ""
3230
docker_cmd:
@@ -39,31 +37,27 @@ jobs:
3937
ARCH: x86
4038
cpp_arch: amd64_x86
4139
zmq_draft: false
42-
zmq_version: 4.3.4
4340

4441
# - os: windows-2022
4542
# node_version: 18
4643
# node_arch: x64
4744
# ARCH: arm64
4845
# cpp_arch: amd64_arm64
4946
# zmq_draft: false
50-
# zmq_version: 4.3.4
5147

5248
- os: macos-11
5349
node_version: 18
5450
node_arch: x64
5551
ARCH: x86_64
5652
cpp_arch: x64
5753
zmq_draft: false
58-
zmq_version: 4.3.4
5954

6055
- os: macos-11
6156
node_version: 18
6257
node_arch: x64
6358
ARCH: arm64
6459
cpp_arch: amd64_arm64
6560
zmq_draft: false
66-
zmq_version: 4.3.4
6761

6862
- os: ubuntu-22.04
6963
docker: node:18-alpine
@@ -73,10 +67,8 @@ jobs:
7367
ARCH: x64
7468
cpp_arch: x64
7569
zmq_draft: false
76-
zmq_version: 4.3.4
7770

7871
env:
79-
ZMQ_VERSION: ${{ matrix.zmq_version }}
8072
ZMQ_DRAFT: ${{ matrix.zmq_draft }}
8173
ZMQ_SHARED: false
8274
ARCH: ${{ matrix.ARCH }}

script/build.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import {mkdir, cd, exec, find, mv} from "shelljs"
55
const root = dirname(__dirname)
66

77
function main() {
8-
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions
9-
const zmq_version = process.env.ZMQ_VERSION || "4.3.4"
10-
const src_url = `https://github.com/zeromq/libzmq/releases/download/v${zmq_version}/zeromq-${zmq_version}.tar.gz`
8+
const zmq_rev =
9+
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions
10+
process.env.ZMQ_VERSION || "20de92ac0a2b2b9a1869782a429df68f93c3625e"
11+
const src_url = `https://github.com/zeromq/libzmq/archive/${zmq_rev}.tar.gz`
1112

1213
const libzmq_build_prefix = `${root}/build/libzmq-staging`
1314
const libzmq_install_prefix = `${root}/build/libzmq`
@@ -16,8 +17,8 @@ function main() {
1617
process.platform === "win32" ? ".lib" : ".a"
1718
}`
1819

19-
const src_dir = `zeromq-${zmq_version}`
20-
const tarball = `zeromq-${zmq_version}.tar.gz`
20+
const src_dir = `libzmq-${zmq_rev}`
21+
const tarball = `libzmq-${zmq_rev}.tar.gz`
2122

2223
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions
2324
const CMAKE_BUILD_TYPE = process.env.CMAKE_BUILD_TYPE || "Release"

0 commit comments

Comments
 (0)