Update distribution

This commit is contained in:
Paul Hatcherian 2020-09-02 07:53:15 -04:00
parent 8350354c9c
commit c7b61df97d

47
dist/index.js vendored
View file

@ -951,20 +951,26 @@ const eol = __webpack_require__(87).EOL;
const tagPrefix = core.getInput('tag_prefix') || ''; const tagPrefix = core.getInput('tag_prefix') || '';
const cmd = async (command, ...args) => { const cmd = async (command, ...args) => {
let output = ''; let output = '', errors = '';
const options = { const options = {
silent: true silent: true
}; };
options.listeners = { options.listeners = {
stdout: (data) => { output += data.toString(); } stdout: (data) => { output += data.toString(); },
stderr: (data) => { errors += data.toString(); }
}; };
await exec.exec(command, args, options) await exec.exec(command, args, options)
.catch(err => { core.error(`${command} ${args.join(' ')} failed: ${err}`); throw err; }); .catch(err => { core.warning(`${command} ${args.join(' ')} failed: ${err}`); });
if (errors !== '') {
core.warning(errors);
}
return output; return output;
}; };
const setOutput = (major, minor, patch, increment, changed, branch) => { const setOutput = (major, minor, patch, increment, changed, branch, namespace) => {
const format = core.getInput('format', { required: true }); const format = core.getInput('format', { required: true });
var version = format var version = format
.replace('${major}', major) .replace('${major}', major)
@ -972,6 +978,10 @@ const setOutput = (major, minor, patch, increment, changed, branch) => {
.replace('${patch}', patch) .replace('${patch}', patch)
.replace('${increment}', increment); .replace('${increment}', increment);
if (namespace !== '') {
version += `-${namespace}`
}
const tag = tagPrefix + version; const tag = tagPrefix + version;
const repository = process.env.GITHUB_REPOSITORY; const repository = process.env.GITHUB_REPOSITORY;
@ -998,17 +1008,17 @@ async function run() {
const majorPattern = core.getInput('major_pattern', { required: true }); const majorPattern = core.getInput('major_pattern', { required: true });
const minorPattern = core.getInput('minor_pattern', { required: true }); const minorPattern = core.getInput('minor_pattern', { required: true });
const changePath = core.getInput('change_path') || ''; const changePath = core.getInput('change_path') || '';
const namespace = core.getInput('namespace') || '';
const releasePattern = `${tagPrefix}*`; const releasePattern = namespace === '' ? `${tagPrefix}*[0-9.]` : `${tagPrefix}*[0-9.]-${namespace}`;
let major = 0, minor = 0, patch = 0, increment = 0; let major = 0, minor = 0, patch = 0, increment = 0;
let changed = true; let changed = true;
let lastCommitAll = (await cmd('git', 'rev-list', '-n1', '--all')).trim(); let lastCommitAll = (await cmd('git', 'rev-list', '-n1', '--all')).trim();
if (lastCommitAll === '') { if (lastCommitAll === '') {
// empty repo // empty repo
setOutput('0', '0', '0', '0', changed, branch); setOutput('0', '0', '0', '0', changed, branch, namespace);
return; return;
} }
@ -1041,6 +1051,7 @@ async function run() {
let tagParts = tag.split('/'); let tagParts = tag.split('/');
let versionValues = tagParts[tagParts.length - 1] let versionValues = tagParts[tagParts.length - 1]
.substr(tagPrefix.length) .substr(tagPrefix.length)
.slice(0, namespace === '' ? 999 : -(namespace.length + 1))
.split('.'); .split('.');
major = parseInt(versionValues[0]); major = parseInt(versionValues[0]);
@ -1048,23 +1059,27 @@ async function run() {
patch = versionValues.length > 2 ? parseInt(versionValues[2]) : 0; patch = versionValues.length > 2 ? parseInt(versionValues[2]) : 0;
if (isNaN(major) || isNaN(minor) || isNaN(patch)) { if (isNaN(major) || isNaN(minor) || isNaN(patch)) {
throw `Invalid tag ${tag}`; core.setFailed(`Invalid tag ${tag} (${versionValues})`);
return;
} }
root = await cmd('git', `merge-base`, tag, branch); root = await cmd('git', `merge-base`, tag, branch);
} }
root = root.trim(); root = root.trim();
const log = await cmd( var logCommand = `git log --pretty="%s" --author-date-order ${(root === '' ? branch : `${root}..${branch}`)}`;
'git',
'log',
'--pretty="%s"',
'--author-date-order',
root === '' ? branch : `${root}..${branch}`);
if (changePath !== '') { if (changePath !== '') {
const changedFiles = await cmd(`git diff --name-only ${root}..${branch} -- ${changePath}`); logCommand += ` -- ${changePath}`;
}
const log = await cmd(logCommand);
core.info("LOG:\n" + log)
if (changePath !== '') {
const changedFiles = await cmd(`git diff --name-only ${(root === '' ? branch : `${root}..${branch}`)} -- ${changePath}`);
changed = changedFiles.length > 0; changed = changedFiles.length > 0;
} }
@ -1093,7 +1108,7 @@ async function run() {
patch++; patch++;
} }
setOutput(major, minor, patch, increment, changed, branch); setOutput(major, minor, patch, increment, changed, branch, namespace);
} catch (error) { } catch (error) {
core.error(error); core.error(error);