Skip to content

Commit 90d46c3

Browse files
committed
TEMP: Fix librdkafka commit
1 parent 345a507 commit 90d46c3

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

.semaphore/semaphore.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ global_job_config:
1010
- name: LIBRDKAFKA_VERSION
1111
value: v2.14.2
1212
# TODO KIP-932: Remove LIBRDKAFKA_BRANCH once LIBRDKAFKA_VERSION includes share consumer support
13+
# Pinned to a specific librdkafka commit; build-librdkafka-branch.sh fetches it by SHA.
1314
- name: LIBRDKAFKA_BRANCH
14-
value: dev_kip-932_queues-for-kafka
15+
value: 49345336e8258b0615ab3b1bc42099a208770ad4
1516
prologue:
1617
commands:
1718
- checkout

tools/wheels/build-librdkafka-branch.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
# Usage: build-librdkafka-branch.sh <branch> <destdir>
1010
#
11-
# branch - git branch name, e.g. dev_kip-932_queues-for-kafka
11+
# branch - git branch, tag, or commit SHA, e.g. dev_kip-932_queues-for-kafka
1212
# destdir - destination directory, e.g. dest
1313
#
1414
# Resulting layout (mirrors NuGet redist package):
@@ -39,8 +39,13 @@ INSTALL=$SRC/install
3939
[[ -d "$DEST" ]] || mkdir -p "$DEST"
4040
rm -rf "$SRC"
4141

42-
git clone --depth 1 --branch "$BRANCH" \
43-
https://github.com/confluentinc/librdkafka.git "$SRC"
42+
# $BRANCH may be a branch, tag, or commit SHA. `git clone --branch` rejects a
43+
# bare SHA, so fetch the ref explicitly (GitHub allows fetching a commit by SHA).
44+
mkdir -p "$SRC"
45+
git -C "$SRC" init
46+
git -C "$SRC" remote add origin https://github.com/confluentinc/librdkafka.git
47+
git -C "$SRC" fetch --depth 1 origin "$BRANCH"
48+
git -C "$SRC" checkout FETCH_HEAD
4449

4550
if [[ $OSTYPE == linux* ]]; then
4651
sudo apt-get update -qq && sudo apt-get install -y -qq libssl-dev libsasl2-dev liblz4-dev libzstd-dev

0 commit comments

Comments
 (0)