From ba62039bc0dfa68f7e9b71ebc67898b90545868d Mon Sep 17 00:00:00 2001 From: Gary Wilber Date: Fri, 20 Jan 2023 14:03:17 -0800 Subject: [PATCH] v2.14.4 --- ci/update-version.js | 26 +++++++++++++++----------- package.json | 4 ++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ci/update-version.js b/ci/update-version.js index d14cdfc2..b40b91e3 100644 --- a/ci/update-version.js +++ b/ci/update-version.js @@ -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 || '' ]; @@ -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; } diff --git a/package.json b/package.json index 5d2aad53..49e4f274 100644 --- a/package.json +++ b/package.json @@ -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", @@ -45,4 +45,4 @@ "engines": { "node": ">=6.0.0" } -} \ No newline at end of file +}