Skip to content

Commit ba62039

Browse files
committed
v2.14.4
1 parent d521e0f commit ba62039

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

ci/update-version.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function parseVersion(tag) {
1111
const { major, minor, prerelease, patch } = semver.parse(tag);
1212

1313
// Describe will give is commits since last tag
14-
const [ commitsSinceTag, hash ] = prerelease[0] ? prerelease[0].split('-') : [
14+
const [commitsSinceTag, hash] = prerelease[0] ? prerelease[0].split('-') : [
1515
1,
1616
process.env.TRAVIS_COMMIT || ''
1717
];
@@ -84,19 +84,23 @@ function getBranch(cb) {
8484
}
8585

8686
function getPackageVersion(tag, branch) {
87-
let baseVersion = `v${tag.major}.${tag.minor}.${tag.patch}`;
87+
const baseVersion = `v${tag.major}.${tag.minor}.${tag.patch}`;
8888

89-
if (tag.commit === 0 && branch === 'master') {
90-
return baseVersion;
91-
}
89+
console.log(`Package version is "${baseVersion}"`);
9290

93-
baseVersion += '-';
91+
// never publish with an suffix
92+
// fixes https://github.com/Blizzard/node-rdkafka/issues/981
93+
// baseVersion += '-';
9494

95-
if (branch !== 'master') {
96-
baseVersion += (tag.commit + 1 + '.' + branch);
97-
} else {
98-
baseVersion += (tag.commit + 1);
99-
}
95+
// if (tag.commit === 0 && branch === 'master') {
96+
// return baseVersion;
97+
// }
98+
99+
// if (branch !== 'master') {
100+
// baseVersion += (tag.commit + 1 + '.' + branch);
101+
// } else {
102+
// baseVersion += (tag.commit + 1);
103+
// }
100104

101105
return baseVersion;
102106
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-rdkafka",
3-
"version": "v2.14.0",
3+
"version": "v2.14.4",
44
"description": "Node.js bindings for librdkafka",
55
"librdkafka": "1.9.2",
66
"main": "lib/index.js",
@@ -45,4 +45,4 @@
4545
"engines": {
4646
"node": ">=6.0.0"
4747
}
48-
}
48+
}

0 commit comments

Comments
 (0)