Skip to content

Commit 3e2e66f

Browse files
emasabemasab
authored
Bump version to v1.6.0-rc2 (#381)
* Bump version to v1.6.0-rc2 * pass npm authentication * Always pass the .npmrc to docker run * Removed npm update on test
1 parent 1ab0518 commit 3e2e66f

File tree

13 files changed

+1967
-2922
lines changed

13 files changed

+1967
-2922
lines changed

‎.semaphore/build-docker-alpine.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
apk add -U ca-certificates openssl ncurses coreutils python3 make gcc g++ libgcc linux-headers grep util-linux binutils findutils perl patch musl-dev bash
77
# /v is the volume mount point for the project root
88
cd /v
9-
npm ci
9+
npm --userconfig /.npmrc ci
1010
npx node-pre-gyp package

‎.semaphore/build-docker-debian.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ apt install -y gcc make build-essential
77

88
# /v is the volume mount point for the project root
99
cd /v
10-
npm ci
10+
npm --userconfig /.npmrc ci
1111
npx node-pre-gyp package

‎.semaphore/docker_run_with_volumes.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
docker run -v "$HOME/.npmrc:/.npmrc" -v "$(pwd):/v" "$@"

‎.semaphore/post_install.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ blocks:
3838
- env_var: NODE_VERSION
3939
values: ["18", "20", "21", "22", "23", "24"]
4040
commands:
41-
- docker run -v "$(pwd):/v" "$DOCKER_IMAGE" /v/ci/post-install/install-debian.sh "$NODE_VERSION" "$LIBRARY_VERSION"
41+
- .semaphore/docker_run_with_volumes.sh "$DOCKER_IMAGE" /v/ci/post-install/install-debian.sh "$NODE_VERSION" "$LIBRARY_VERSION"
4242

4343
- name: "Debian-based OS (arm64)"
4444
dependencies: [ ]
@@ -57,7 +57,7 @@ blocks:
5757
- env_var: NODE_VERSION
5858
values: ["18", "20", "21", "22", "23", "24"]
5959
commands:
60-
- docker run -v "$(pwd):/v" "$DOCKER_IMAGE" /v/ci/post-install/install-debian.sh "$NODE_VERSION" "$LIBRARY_VERSION"
60+
- .semaphore/docker_run_with_volumes.sh "$DOCKER_IMAGE" /v/ci/post-install/install-debian.sh "$NODE_VERSION" "$LIBRARY_VERSION"
6161

6262
- name: "Alpine-based OS (amd64)"
6363
dependencies: [ ]
@@ -74,7 +74,7 @@ blocks:
7474
- env_var: NODE_VERSION
7575
values: ["18", "20", "21", "22", "23", "24"]
7676
commands:
77-
- docker run -v "$(pwd):/v" "node:${NODE_VERSION}-alpine" /v/ci/post-install/install-alpine.sh "$NODE_VERSION" "$LIBRARY_VERSION"
77+
- .semaphore/docker_run_with_volumes.sh "node:${NODE_VERSION}-alpine" /v/ci/post-install/install-alpine.sh "$NODE_VERSION" "$LIBRARY_VERSION"
7878

7979
- name: "Alpine-based OS (arm64)"
8080
dependencies: [ ]
@@ -91,7 +91,7 @@ blocks:
9191
- env_var: NODE_VERSION
9292
values: ["18", "20", "21", "22", "23", "24"]
9393
commands:
94-
- docker run -v "$(pwd):/v" "node:${NODE_VERSION}-alpine" /v/ci/post-install/install-alpine.sh "$NODE_VERSION" "$LIBRARY_VERSION"
94+
- .semaphore/docker_run_with_volumes.sh "node:${NODE_VERSION}-alpine" /v/ci/post-install/install-alpine.sh "$NODE_VERSION" "$LIBRARY_VERSION"
9595

9696
- name: "RHEL-based OS (amd64)"
9797
dependencies: [ ]
@@ -110,7 +110,7 @@ blocks:
110110
- env_var: NODE_VERSION
111111
values: ["18", "20", "21", "22", "23", "24"]
112112
commands:
113-
- docker run -v "$(pwd):/v" "$DOCKER_IMAGE" /v/ci/post-install/install-rhel.sh "$NODE_VERSION" "$LIBRARY_VERSION"
113+
- .semaphore/docker_run_with_volumes.sh "$DOCKER_IMAGE" /v/ci/post-install/install-rhel.sh "$NODE_VERSION" "$LIBRARY_VERSION"
114114

115115
- name: "RHEL-based OS (arm64)"
116116
dependencies: [ ]
@@ -129,7 +129,7 @@ blocks:
129129
- env_var: NODE_VERSION
130130
values: ["18", "20", "21", "22", "23", "24"]
131131
commands:
132-
- docker run -v "$(pwd):/v" "$DOCKER_IMAGE" /v/ci/post-install/install-rhel.sh "$NODE_VERSION" "$LIBRARY_VERSION"
132+
- .semaphore/docker_run_with_volumes.sh "$DOCKER_IMAGE" /v/ci/post-install/install-rhel.sh "$NODE_VERSION" "$LIBRARY_VERSION"
133133

134134
- name: "Mac (Intel)"
135135
dependencies: [ ]

‎.semaphore/semaphore.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ global_job_config:
3030
- git submodule update --init --recursive
3131
epilogue:
3232
commands:
33-
- if [[ $(command cache) ]]; then cache store "$LIBRDKAFKA_COMMIT_HASH" deps/librdkafka; done
33+
- if [[ $(command cache) ]]; then cache store "$LIBRDKAFKA_COMMIT_HASH" deps/librdkafka; fi
3434

3535
blocks:
3636
- name: "Linux amd64 (musl): Build and test"
@@ -47,7 +47,7 @@ blocks:
4747
jobs:
4848
- name: "Build from source and test for musl"
4949
commands:
50-
- docker run -v "$(pwd):/v" node:18-alpine /v/.semaphore/build-docker-alpine.sh
50+
- .semaphore/docker_run_with_volumes.sh node:18-alpine /v/.semaphore/build-docker-alpine.sh
5151

5252
- name: "Linux arm64 (musl): Build and test"
5353
run:
@@ -63,7 +63,7 @@ blocks:
6363
jobs:
6464
- name: "Build from source and test for musl"
6565
commands:
66-
- docker run -v "$(pwd):/v" node:18-alpine /v/.semaphore/build-docker-alpine.sh
66+
- .semaphore/docker_run_with_volumes.sh node:18-alpine /v/.semaphore/build-docker-alpine.sh
6767

6868
- name: "Linux amd64: Build and test"
6969
run:
@@ -230,7 +230,7 @@ blocks:
230230
- export NODE_VERSION=$(echo $NODE_VERSION_ABI | cut -d, -f1)
231231
- export NODE_ABI=$(echo $NODE_VERSION_ABI | cut -d, -f2)
232232
- export ARTIFACT_KEY="confluent-kafka-javascript-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
233-
- docker run -v "$(pwd):/v" node:${NODE_VERSION}-bullseye /v/.semaphore/build-docker-debian.sh
233+
- .semaphore/docker_run_with_volumes.sh node:${NODE_VERSION}-bullseye /v/.semaphore/build-docker-debian.sh
234234
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
235235
- artifact push workflow "build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}" --destination "releases/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}"
236236

@@ -267,7 +267,7 @@ blocks:
267267
- export NODE_VERSION=$(echo $NODE_VERSION_ABI | cut -d, -f1)
268268
- export NODE_ABI=$(echo $NODE_VERSION_ABI | cut -d, -f2)
269269
- export ARTIFACT_KEY="confluent-kafka-javascript-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
270-
- docker run -v "$(pwd):/v" node:${NODE_VERSION}-bullseye /v/.semaphore/build-docker-debian.sh
270+
- .semaphore/docker_run_with_volumes.sh node:${NODE_VERSION}-bullseye /v/.semaphore/build-docker-debian.sh
271271
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
272272
- artifact push workflow "build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}" --destination "releases/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}"
273273

@@ -304,7 +304,7 @@ blocks:
304304
- export NODE_VERSION=$(echo $NODE_VERSION_ABI | cut -d, -f1)
305305
- export NODE_ABI=$(echo $NODE_VERSION_ABI | cut -d, -f2)
306306
- export ARTIFACT_KEY="confluent-kafka-javascript-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-linux-${LIBC}-${ARCHITECTURE}.tar.gz"
307-
- docker run -v "$(pwd):/v" node:${NODE_VERSION}-alpine /v/.semaphore/build-docker-alpine.sh
307+
- .semaphore/docker_run_with_volumes.sh node:${NODE_VERSION}-alpine /v/.semaphore/build-docker-alpine.sh
308308
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
309309
- artifact push workflow "build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}" --destination "releases/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}"
310310

@@ -341,7 +341,7 @@ blocks:
341341
- export NODE_VERSION=$(echo $NODE_VERSION_ABI | cut -d, -f1)
342342
- export NODE_ABI=$(echo $NODE_VERSION_ABI | cut -d, -f2)
343343
- export ARTIFACT_KEY="confluent-kafka-javascript-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-linux-${LIBC}-${ARCHITECTURE}.tar.gz"
344-
- docker run -v "$(pwd):/v" node:${NODE_VERSION}-alpine /v/.semaphore/build-docker-alpine.sh
344+
- .semaphore/docker_run_with_volumes.sh node:${NODE_VERSION}-alpine /v/.semaphore/build-docker-alpine.sh
345345
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
346346
- artifact push workflow "build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}" --destination "releases/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}"
347347

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ lib: node_modules/.dirstamp $(CONFIG_OUTPUTS)
4444
@PYTHONHTTPSVERIFY=0 $(NODE-GYP) build $(GYPBUILDARGS)
4545

4646
node_modules/.dirstamp: package.json
47-
@npm update --loglevel warn
47+
@npm ci --loglevel warn
4848
@touch $@
4949

5050
$(CONFIG_OUTPUTS): node_modules/.dirstamp binding.gyp

‎lib/error.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LibrdKafkaError.wrap = errorWrap;
2828
* @constant
2929
* @memberof RdKafka
3030
*/
31-
// ====== Generated from librdkafka v2.12.0-RC2 file src-cpp/rdkafkacpp.h ======
31+
// ====== Generated from librdkafka 2.12.0-RC2 file src-cpp/rdkafkacpp.h ======
3232
LibrdKafkaError.codes = {
3333

3434
/* Internal errors to rdkafka: */

‎lib/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ util.dictToStringList = function (mapOrObject) {
5252
return list;
5353
};
5454

55-
util.bindingVersion = '1.5.0';
55+
util.bindingVersion = '1.6.0-rc2';

0 commit comments

Comments
 (0)