Skip to content

Commit 3f89fe5

Browse files
milindlmilindl
committed
Merge branch 'feature/add-basic-semaphore-setup' into dev_early_access_development_branch
2 parents 3aaf9e5 + d40e326 commit 3f89fe5

File tree

6 files changed

+330
-370
lines changed

6 files changed

+330
-370
lines changed

‎.semaphore/semaphore.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ blocks:
9797
commands:
9898
- sem-version node 18.19.0
9999
- export NODE_ABI=108
100-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
100+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
101101
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
102102
- npx node-pre-gyp package
103103
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
@@ -106,7 +106,7 @@ blocks:
106106
commands:
107107
- sem-version node 20.10.0
108108
- export NODE_ABI=115
109-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
109+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
110110
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
111111
- npx node-pre-gyp package
112112
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
@@ -115,7 +115,7 @@ blocks:
115115
commands:
116116
- sem-version node 21.4.0
117117
- export NODE_ABI=120
118-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
118+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
119119
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
120120
- npx node-pre-gyp package
121121
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
@@ -141,7 +141,7 @@ blocks:
141141
commands:
142142
- sem-version node 18.19.0
143143
- export NODE_ABI=108
144-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
144+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
145145
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
146146
- npx node-pre-gyp package
147147
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
@@ -150,7 +150,7 @@ blocks:
150150
commands:
151151
- sem-version node 20.10.0
152152
- export NODE_ABI=115
153-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
153+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
154154
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
155155
- npx node-pre-gyp package
156156
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
@@ -159,7 +159,7 @@ blocks:
159159
commands:
160160
- sem-version node 21.4.0
161161
- export NODE_ABI=120
162-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
162+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
163163
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
164164
- npx node-pre-gyp package
165165
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
@@ -184,7 +184,7 @@ blocks:
184184
commands:
185185
- sem-version node 18.19.0
186186
- export NODE_ABI=108
187-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
187+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
188188
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
189189
- npx node-pre-gyp package
190190
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
@@ -193,7 +193,7 @@ blocks:
193193
commands:
194194
- sem-version node 20.10.0
195195
- export NODE_ABI=115
196-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
196+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
197197
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
198198
- npx node-pre-gyp package
199199
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}
@@ -202,7 +202,7 @@ blocks:
202202
commands:
203203
- sem-version node 21.4.0
204204
- export NODE_ABI=120
205-
- export ARTIFACT_KEY="node-librdkafka-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
205+
- export ARTIFACT_KEY="confluent-kafka-js-${SEMAPHORE_GIT_TAG_NAME}-node-v${NODE_ABI}-${PLATFORM}-${LIBC}-${ARCHITECTURE}.tar.gz"
206206
- npm install # node-pre-gyp will fallback to build here, because new tag implies no release yet.
207207
- npx node-pre-gyp package
208208
- ls build/stage/${SEMAPHORE_GIT_TAG_NAME}/${ARTIFACT_KEY}

‎binding.gyp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@
9595
"libraries": [
9696
"../build/deps/librdkafka.dylib",
9797
"../build/deps/librdkafka++.dylib",
98-
"-Wl,-rpath='$$ORIGIN/../deps'",
98+
"-Wl,-rpath,'$$ORIGIN/../deps'",
9999
],
100100
},
101101
{
102102
"libraries": [
103103
"../build/deps/librdkafka.so",
104104
"../build/deps/librdkafka++.so",
105-
"-Wl,-rpath='$$ORIGIN/../deps'",
105+
"-Wl,-rpath,'$$ORIGIN/../deps'",
106106
],
107107
},
108108
]
@@ -112,7 +112,7 @@
112112
"libraries": [
113113
"../build/deps/librdkafka-static.a",
114114
"../build/deps/librdkafka++.a",
115-
"-Wl,-rpath='$$ORIGIN/../deps'",
115+
"-Wl,-rpath,'$$ORIGIN/../deps'",
116116
],
117117
}
118118
],

‎deps/librdkafka‎

‎deps/librdkafka.gyp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
"inputs": [
2929
"librdkafka/config.h",
3030
],
31+
"outputs": [
32+
"deps/librdkafka/src/librdkafka.so",
33+
],
3134
"action": [
3235
"make", "-C", "librdkafka", "libs", "install"
3336
],

0 commit comments

Comments
 (0)