Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- don't warn for specific git commands
  • Loading branch information
StephenHodgson committed Jan 23, 2025
1 parent ee7ad31 commit 53f9d46
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28110,11 +28110,11 @@ const main = async () => {
}
if (!majorSha) {
await git(['tag', '-a', majorTag, '-m', 'create major release tag']);
await git(['push', 'origin', majorTag, '--force']);
await git(['push', 'origin', majorTag, '--force'], false);
}
else if (tags.get(latestTag) !== majorSha) {
await git(['tag', '-fa', majorTag, '-m', 'update major release tag']);
await git(['push', 'origin', majorTag, '--force']);
await git(['push', 'origin', majorTag, '--force'], false);
}
}
if (updateMinor && minor !== '0') {
Expand All @@ -28129,11 +28129,11 @@ const main = async () => {
}
if (!minorSha) {
await git(['tag', '-a', minorTag, '-m', 'create minor release tag']);
await git(['push', 'origin', minorTag, '--force']);
await git(['push', 'origin', minorTag, '--force'], false);
}
else if (tags.get(latestTag) !== minorSha) {
await git(['tag', '-fa', minorTag, '-m', 'update minor release tag']);
await git(['push', 'origin', minorTag, '--force']);
await git(['push', 'origin', minorTag, '--force'], false);
}
}
}
Expand All @@ -28155,7 +28155,7 @@ async function getTags() {
async function getParentSha(ref) {
return (await git(['rev-parse', '--verify', `${ref}^{}`])).trim();
}
async function git(params) {
async function git(params, warnOnError = true) {
let output = '';
let error = '';
const exitCode = await exec.exec('git', params, {
Expand All @@ -28171,7 +28171,7 @@ async function git(params) {
if (exitCode !== 0) {
throw new Error(error);
}
if (error) {
if (error && warnOnError) {
core.warning(error);
}
return output;
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "update-action-release-tags",
"version": "1.0.2",
"version": "1.0.3",
"description": "A GitHub Action to update pinned action release versions.",
"author": "RageAgainstThePixel",
"license": "MIT",
Expand Down
12 changes: 6 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ const main = async () => {
}
if (!majorSha) {
await git(['tag', '-a', majorTag, '-m', 'create major release tag']);
await git(['push', 'origin', majorTag, '--force']);
await git(['push', 'origin', majorTag, '--force'], false);
} else if (tags.get(latestTag) !== majorSha) {
await git(['tag', '-fa', majorTag, '-m', 'update major release tag']);
await git(['push', 'origin', majorTag, '--force']);
await git(['push', 'origin', majorTag, '--force'], false);
}
}
if (updateMinor && minor !== '0') {
Expand All @@ -52,10 +52,10 @@ const main = async () => {
}
if (!minorSha) {
await git(['tag', '-a', minorTag, '-m', 'create minor release tag']);
await git(['push', 'origin', minorTag, '--force']);
await git(['push', 'origin', minorTag, '--force'], false);
} else if (tags.get(latestTag) !== minorSha) {
await git(['tag', '-fa', minorTag, '-m', 'update minor release tag']);
await git(['push', 'origin', minorTag, '--force']);
await git(['push', 'origin', minorTag, '--force'], false);
}
}
} catch (error) {
Expand Down Expand Up @@ -94,7 +94,7 @@ async function getParentSha(ref: string): Promise<string> {
* @param params Git command parameters
* @returns Git command output
*/
async function git(params: string[]): Promise<string> {
async function git(params: string[], warnOnError: boolean = true): Promise<string> {
let output: string = '';
let error: string = '';
const exitCode = await exec.exec('git', params, {
Expand All @@ -110,7 +110,7 @@ async function git(params: string[]): Promise<string> {
if (exitCode !== 0) {
throw new Error(error);
}
if (error) {
if (error && warnOnError) {
core.warning(error);
}
return output;
Expand Down

0 comments on commit 53f9d46

Please sign in to comment.