actions/semantic-version
6
0
Fork 0
mirror of https://github.com/PaulHatch/semantic-version.git synced 2025-12-27 04:58:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the current tag, if present, for version

Browse source
This commit is contained in:
Paul Hatcherian 2020-10-07 18:26:03 -04:00
parent 4160681a29
commit 5c67e25f43
3 changed files with 83 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
dist/index.js vendored
View file

@ -1024,6 +1024,7 @@ const exec = __webpack_require__(986);
const eol = __webpack_require__(87).EOL;
const tagPrefix = core.getInput('tag_prefix') || '';
const namespace = core.getInput('namespace') || '';
const cmd = async (command, ...args) => {
let output = '', errors = '';
@ -1032,10 +1033,12 @@ const cmd = async (command, ...args) => {
};
options.listeners = {
stdout: (data) => { output += data.toString(); },
stderr: (data) => { errors += data.toString(); }
stderr: (data) => { errors += data.toString(); },
ignoreReturnCode: true,
silent: true
};
await exec.exec(command + args.map(a => ` ${a}`).join(' '), [], options)
await exec.exec(command, args, options)
.catch(err => { core.info(`The command '${command} ${args.join(' ')}' failed: ${err}`); });
if (errors !== '') {
@ -1088,6 +1091,26 @@ const setOutput = (major, minor, patch, increment, changed, branch, namespace) =
};
const parseVersion = (tag) => {
console.log(tag);
let tagParts = tag.split('/');
let versionValues = tagParts[tagParts.length - 1]
.substr(tagPrefix.length)
.slice(0, namespace === '' ? 999 : -(namespace.length + 1))
.split('.');
let major = parseInt(versionValues[0]);
let minor = versionValues.length > 1 ? parseInt(versionValues[1]) : 0;
let patch = versionValues.length > 2 ? parseInt(versionValues[2]) : 0;
if (isNaN(major) || isNaN(minor) || isNaN(patch)) {
throw `Invalid tag ${tag} (${versionValues})`;
}
return [major, minor, patch];
};
async function run() {
try {
const remote = await cmd('git', 'remote');
@ -1098,7 +1121,6 @@ async function run() {
const majorPattern = core.getInput('major_pattern', { required: true });
const minorPattern = core.getInput('minor_pattern', { required: true });
const changePath = core.getInput('change_path') || '';
const namespace = core.getInput('namespace') || '';
const releasePattern = namespace === '' ? `${tagPrefix}*[0-9.]` : `${tagPrefix}*[0-9.]-${namespace}`;
let major = 0, minor = 0, patch = 0, increment = 0;
@ -1112,7 +1134,14 @@ async function run() {
return;
}
//let commit = (await cmd('git', 'rev-parse', 'HEAD')).trim();
let currentTag = (await cmd(
`git tag --points-at ${branch} ${releasePattern}`
)).trim();
if (currentTag) {
[major, minor, patch] = parseVersion(currentTag);
setOutput(major, minor, patch, 0, false, branch, namespace);
}
let tag = '';
try {
@ -1121,7 +1150,7 @@ async function run() {
`describe`,
`--tags`,
`--abbrev=0`,
`--match="${releasePattern}"`,
`--match=${releasePattern}`,
`${branch}~1`
)).trim();
}
@ -1138,20 +1167,7 @@ async function run() {
root = '';
} else {
// parse the version tag
let tagParts = tag.split('/');
let versionValues = tagParts[tagParts.length - 1]
.substr(tagPrefix.length)
.slice(0, namespace === '' ? 999 : -(namespace.length + 1))
.split('.');
major = parseInt(versionValues[0]);
minor = versionValues.length > 1 ? parseInt(versionValues[1]) : 0;
patch = versionValues.length > 2 ? parseInt(versionValues[2]) : 0;
if (isNaN(major) || isNaN(minor) || isNaN(patch)) {
core.setFailed(`Invalid tag ${tag} (${versionValues})`);
return;
}
[major, minor, patch] = parseVersion(tag);
root = await cmd('git', `merge-base`, tag, branch);
}
@ -1211,6 +1227,7 @@ async function run() {
run();
/***/ }),
/***/ 129:

58
index.js
View file

@ -3,6 +3,7 @@ const exec = require("@actions/exec");
const eol = require('os').EOL;
const tagPrefix = core.getInput('tag_prefix') || '';
const namespace = core.getInput('namespace') || '';
const cmd = async (command, ...args) => {
let output = '', errors = '';
@ -69,6 +70,26 @@ const setOutput = (major, minor, patch, increment, changed, branch, namespace) =
};
const parseVersion = (tag) => {
console.log(tag);
let tagParts = tag.split('/');
let versionValues = tagParts[tagParts.length - 1]
.substr(tagPrefix.length)
.slice(0, namespace === '' ? 999 : -(namespace.length + 1))
.split('.');
let major = parseInt(versionValues[0]);
let minor = versionValues.length > 1 ? parseInt(versionValues[1]) : 0;
let patch = versionValues.length > 2 ? parseInt(versionValues[2]) : 0;
if (isNaN(major) || isNaN(minor) || isNaN(patch)) {
throw `Invalid tag ${tag} (${versionValues})`;
}
return [major, minor, patch];
};
async function run() {
try {
const remote = await cmd('git', 'remote');
@ -79,7 +100,6 @@ async function run() {
const majorPattern = core.getInput('major_pattern', { required: true });
const minorPattern = core.getInput('minor_pattern', { required: true });
const changePath = core.getInput('change_path') || '';
const namespace = core.getInput('namespace') || '';
const releasePattern = namespace === '' ? `${tagPrefix}*[0-9.]` : `${tagPrefix}*[0-9.]-${namespace}`;
let major = 0, minor = 0, patch = 0, increment = 0;
@ -93,7 +113,14 @@ async function run() {
return;
}
//let commit = (await cmd('git', 'rev-parse', 'HEAD')).trim();
let currentTag = (await cmd(
`git tag --points-at ${branch} ${releasePattern}`
)).trim();
if (currentTag) {
[major, minor, patch] = parseVersion(currentTag);
setOutput(major, minor, patch, 0, false, branch, namespace);
}
let tag = '';
try {
@ -105,17 +132,6 @@ async function run() {
`--match=${releasePattern}`,
`${branch}~1`
)).trim();
if (tag === '') {
tag = (await cmd(
'git',
`tag`,
`--list ${releasePattern}`,
`--points-at ${branch}`
)).trim();
}
}
catch (err) {
tag = '';
@ -130,20 +146,7 @@ async function run() {
root = '';
} else {
// parse the version tag
let tagParts = tag.split('/');
let versionValues = tagParts[tagParts.length - 1]
.substr(tagPrefix.length)
.slice(0, namespace === '' ? 999 : -(namespace.length + 1))
.split('.');
major = parseInt(versionValues[0]);
minor = versionValues.length > 1 ? parseInt(versionValues[1]) : 0;
patch = versionValues.length > 2 ? parseInt(versionValues[2]) : 0;
if (isNaN(major) || isNaN(minor) || isNaN(patch)) {
core.setFailed(`Invalid tag ${tag} (${versionValues})`);
return;
}
[major, minor, patch] = parseVersion(tag);
root = await cmd('git', `merge-base`, tag, branch);
}
@ -201,3 +204,4 @@ async function run() {
}
run();

17
index.test.js
View file

@ -86,7 +86,7 @@ test('Tagging does not break version', () => {
repo.exec('git tag v0.0.1')
const result = repo.runAction();
expect(result).toMatch('Version is 0.0.1+1');
expect(result).toMatch('Version is 0.0.1+0');
repo.clean();
});
@ -424,5 +424,20 @@ test('Commits inside path are counted', () => {
expect(result).toMatch('Version is 0.0.1+2');
repo.clean();
});
test('Current tag is used', () => {
const repo = createTestRepo({ tag_prefix: '' }); // 0.0.0
repo.makeCommit('Initial Commit');
repo.makeCommit('Second Commit');
repo.makeCommit('Third Commit');
repo.exec('git tag 7.6.5');
const result = repo.runAction();
expect(result).toMatch('Version is 7.6.5+0');
repo.clean();
});