Skip to content

Commit

Permalink
Fix output mapping
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulHatch committed Dec 31, 2022
1 parent d160cb5 commit ea50fff
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 11 deletions.
7 changes: 7 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ outputs:
description: "Indicates whether there was a change since the last version if change_path was specified. If no change_path was specified this value will always be true since the entire repo is considered."
authors:
description: "List of users contributing commits to this version"
previous_commit:
description: "Hash of the previous commit"
previous_version:
description: "Indicates the previous version"
current_commit:
description: "The current commit hash"

runs:
using: "node16"
main: "dist/index.js"
12 changes: 8 additions & 4 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/VersionResult.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class VersionResult {
* @param authors - Authors formatted according to the format mode (e.g. JSON, CSV, YAML, etc.)
* @param currentCommit - The current commit hash
* @param previousCommit - The previous commit hash
* @param previousVersion - the previous version
* @param previousVersion - The previous version
*/
constructor(major, minor, patch, increment, versionType, formattedVersion, versionTag, changed, authors, currentCommit, previousCommit, previousVersion) {
this.major = major;
Expand Down
8 changes: 6 additions & 2 deletions lib/formatting/DefaultTagFormatter.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,14 @@ class DefaultTagFormatter {
}
;
IsValid(tag) {
const regexEscape = (literal) => literal.replace(/\W/g, '\\$&');
const tagPrefix = regexEscape(this.tagPrefix);
const namespaceSeperator = regexEscape(this.namespaceSeperator);
const namespace = regexEscape(this.namespace);
if (!!this.namespace) {
return new RegExp(`^${this.tagPrefix}[0-9]+.[0-9]+.[0-9]+${this.namespaceSeperator}${this.namespace}$`).test(tag);
return new RegExp(`^${tagPrefix}[0-9]+\.[0-9]+\.[0-9]+${namespaceSeperator}${namespace}$`).test(tag);
}
return new RegExp(`^${this.tagPrefix}[0-9]+.[0-9]+.[0-9]+$`).test(tag);
return new RegExp(`^${tagPrefix}[0-9]+\.[0-9]+\.[0-9]+$`).test(tag);
}
}
exports.DefaultTagFormatter = DefaultTagFormatter;
2 changes: 1 addition & 1 deletion lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ function setOutput(versionResult) {
core.setOutput("changed", changed.toString());
core.setOutput("version_tag", versionTag);
core.setOutput("authors", authors);
core.setOutput("lastVersion", authors);
core.setOutput("previous_commit", previousCommit);
core.setOutput("previous_version", previousVersion);
core.setOutput("current_commit", currentCommit);
}
function run() {
return __awaiter(this, void 0, void 0, function* () {
Expand Down
2 changes: 1 addition & 1 deletion src/VersionResult.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class VersionResult {
* @param authors - Authors formatted according to the format mode (e.g. JSON, CSV, YAML, etc.)
* @param currentCommit - The current commit hash
* @param previousCommit - The previous commit hash
* @param previousVersion - the previous version
* @param previousVersion - The previous version
*/
constructor(
public major: number,
Expand Down
2 changes: 1 addition & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ function setOutput(versionResult: VersionResult) {
core.setOutput("changed", changed.toString());
core.setOutput("version_tag", versionTag);
core.setOutput("authors", authors);
core.setOutput("lastVersion", authors);
core.setOutput("previous_commit", previousCommit);
core.setOutput("previous_version", previousVersion);
core.setOutput("current_commit", currentCommit);
}

export async function run() {
Expand Down

0 comments on commit ea50fff

Please sign in to comment.