Merge pull request #21 from PaulHatch/feature/HeadRef

Support and default to HEAD ref for branch (MAJOR)
This commit is contained in:
Paul Hatcherian 2021-02-08 22:08:31 -05:00 committed by GitHub
commit 1afa8eb537
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 15 deletions

View file

@ -5,9 +5,9 @@ branding:
color: "blue"
inputs:
branch:
description: "The branch name"
description: "Set to specify a specific branch, default is the current HEAD"
required: true
default: "master"
default: "HEAD"
tag_prefix:
description: "The prefix to use to identify tags"
required: false

16
dist/index.js vendored
View file

@ -1072,6 +1072,10 @@ const setOutput = (major, minor, patch, increment, changed, branch, namespace) =
tag = `${tagPrefix}${major}`;
}
if (namespace !== '') {
tag += `-${namespace}`
}
const repository = process.env.GITHUB_REPOSITORY;
if (!changed) {
@ -1126,15 +1130,15 @@ const createMatchTest = (pattern) => {
async function run() {
try {
const remote = await cmd('git', 'remote');
const remoteExists = remote !== '';
const remotePrefix = remoteExists ? 'origin/' : '';
const branch = `${remotePrefix}${core.getInput('branch', { required: true })}`;
let branch = core.getInput('branch', { required: true });
const majorPattern = createMatchTest(core.getInput('major_pattern', { required: true }));
const minorPattern = createMatchTest(core.getInput('minor_pattern', { required: true }));
const changePath = core.getInput('change_path') || '';
if (branch === 'HEAD') {
branch = (await cmd('git', 'rev-parse', 'HEAD')).trim();
}
const versionPattern = shortTags ? '*[0-9.]' : '[0-9]+\\.[0-9]+\\.[0-9]+'
const releasePattern = namespace === '' ? `${tagPrefix}${versionPattern}` : `${tagPrefix}${versionPattern}-${namespace}`;
let major = 0, minor = 0, patch = 0, increment = 0;
@ -1169,7 +1173,7 @@ async function run() {
let root;
if (tag === '') {
if (remoteExists) {
if (await cmd('git', 'remote') !== '') {
core.warning('No tags are present for this repository. If this is unexpected, check to ensure that tags have been pulled from the remote.');
}
// no release tags yet, use the initial commit as the root

View file

@ -109,15 +109,15 @@ const createMatchTest = (pattern) => {
async function run() {
try {
const remote = await cmd('git', 'remote');
const remoteExists = remote !== '';
const remotePrefix = remoteExists ? 'origin/' : '';
const branch = `${remotePrefix}${core.getInput('branch', { required: true })}`;
let branch = core.getInput('branch', { required: true });
const majorPattern = createMatchTest(core.getInput('major_pattern', { required: true }));
const minorPattern = createMatchTest(core.getInput('minor_pattern', { required: true }));
const changePath = core.getInput('change_path') || '';
if (branch === 'HEAD') {
branch = (await cmd('git', 'rev-parse', 'HEAD')).trim();
}
const versionPattern = shortTags ? '*[0-9.]' : '[0-9]+\\.[0-9]+\\.[0-9]+'
const releasePattern = namespace === '' ? `${tagPrefix}${versionPattern}` : `${tagPrefix}${versionPattern}-${namespace}`;
let major = 0, minor = 0, patch = 0, increment = 0;
@ -152,7 +152,7 @@ async function run() {
let root;
if (tag === '') {
if (remoteExists) {
if (await cmd('git', 'remote') !== '') {
core.warning('No tags are present for this repository. If this is unexpected, check to ensure that tags have been pulled from the remote.');
}
// no release tags yet, use the initial commit as the root

View file

@ -6,7 +6,7 @@ const windows = process.platform === "win32";
// Action input variables
const defaultInputs = {
branch: "master",
branch: "HEAD",
tag_prefix: "v",
major_pattern: "(MAJOR)",
minor_pattern: "(MINOR)",
@ -85,6 +85,22 @@ test('Repository with commits shows increment', () => {
repo.clean();
});
test('Repository show commit for checked out commit', () => {
const repo = createTestRepo(); // 0.0.0+0
repo.makeCommit('Initial Commit'); // 0.0.1+0
repo.makeCommit(`Second Commit`); // 0.0.1+1
let result = repo.runAction();
expect(result).toMatch('Version is 0.0.1+1');
repo.exec(`git checkout HEAD~1`); // 0.0.1+1
result = repo.runAction();
expect(result).toMatch('Version is 0.0.1+0');
repo.clean();
});
test('Tagging does not break version', () => {
const repo = createTestRepo(); // 0.0.0+0