Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .semaphore/build-docker-alpine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
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
# /v is the volume mount point for the project root
cd /v
npm ci
npm --userconfig /.npmrc ci
npx node-pre-gyp package
2 changes: 1 addition & 1 deletion .semaphore/build-docker-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ apt install -y gcc make build-essential

# /v is the volume mount point for the project root
cd /v
npm ci
npm --userconfig /.npmrc ci
npx node-pre-gyp package
2 changes: 2 additions & 0 deletions .semaphore/docker_run_with_volumes.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
docker run -v "$HOME/.npmrc:/.npmrc" -v "$(pwd):/v" "$@"
12 changes: 6 additions & 6 deletions .semaphore/post_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ blocks:
- env_var: NODE_VERSION
values: ["18", "20", "21", "22", "23", "24"]
commands:
- docker run -v "$(pwd):/v" "$DOCKER_IMAGE" /v/ci/post-install/install-debian.sh "$NODE_VERSION" "$LIBRARY_VERSION"
- .semaphore/docker_run_with_volumes.sh "$DOCKER_IMAGE" /v/ci/post-install/install-debian.sh "$NODE_VERSION" "$LIBRARY_VERSION"

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

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

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

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

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

- name: "Mac (Intel)"
dependencies: [ ]
Expand Down
14 changes: 7 additions & 7 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ global_job_config:
- git submodule update --init --recursive
epilogue:
commands:
- if [[ $(command cache) ]]; then cache store "$LIBRDKAFKA_COMMIT_HASH" deps/librdkafka; done
- if [[ $(command cache) ]]; then cache store "$LIBRDKAFKA_COMMIT_HASH" deps/librdkafka; fi

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

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

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ lib: node_modules/.dirstamp $(CONFIG_OUTPUTS)
@PYTHONHTTPSVERIFY=0 $(NODE-GYP) build $(GYPBUILDARGS)

node_modules/.dirstamp: package.json
@npm update --loglevel warn
@npm ci --loglevel warn
@touch $@

$(CONFIG_OUTPUTS): node_modules/.dirstamp binding.gyp
Expand Down
2 changes: 1 addition & 1 deletion lib/error.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ LibrdKafkaError.wrap = errorWrap;
* @constant
* @memberof RdKafka
*/
// ====== Generated from librdkafka v2.12.0-RC2 file src-cpp/rdkafkacpp.h ======
// ====== Generated from librdkafka 2.12.0-RC2 file src-cpp/rdkafkacpp.h ======
LibrdKafkaError.codes = {

/* Internal errors to rdkafka: */
Expand Down
2 changes: 1 addition & 1 deletion lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ util.dictToStringList = function (mapOrObject) {
return list;
};

util.bindingVersion = '1.5.0';
util.bindingVersion = '1.6.0-rc2';
Loading