Skip to content

Commit

Permalink
v2.14.4
Browse files Browse the repository at this point in the history
  • Loading branch information
GaryWilber committed Jan 20, 2023
1 parent d521e0f commit ba62039
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
26 changes: 15 additions & 11 deletions ci/update-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function parseVersion(tag) {
const { major, minor, prerelease, patch } = semver.parse(tag);

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

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

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

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

if (branch !== 'master') {
baseVersion += (tag.commit + 1 + '.' + branch);
} else {
baseVersion += (tag.commit + 1);
}
// if (tag.commit === 0 && branch === 'master') {
// return baseVersion;
// }

// if (branch !== 'master') {
// baseVersion += (tag.commit + 1 + '.' + branch);
// } else {
// baseVersion += (tag.commit + 1);
// }

return baseVersion;
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "node-rdkafka",
"version": "v2.14.0",
"version": "v2.14.4",
"description": "Node.js bindings for librdkafka",
"librdkafka": "1.9.2",
"main": "lib/index.js",
Expand Down Expand Up @@ -45,4 +45,4 @@
"engines": {
"node": ">=6.0.0"
}
}
}

0 comments on commit ba62039

Please sign in to comment.