From 93dbcf529f71bcbea07a20f368bed868422a210b Mon Sep 17 00:00:00 2001 From: peter-evans Date: Tue, 22 Mar 2022 03:46:17 +0000 Subject: [PATCH] [CI] test committed --- action.yml | 4 +--- dist/index.js | 42 ++++++++++++++++++++++++++---------------- report.txt | 1 + 3 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 report.txt diff --git a/action.yml b/action.yml index 60e3ade..4cb37f6 100644 --- a/action.yml +++ b/action.yml @@ -13,8 +13,6 @@ inputs: A comma or newline-separated list of file paths to commit. Paths should follow git's pathspec syntax. Defaults to adding all new and modified files. - default: | - -A commit-message: description: 'The message to use when committing changes.' default: '[create-pull-request] automated change' @@ -81,7 +79,7 @@ outputs: pull-request-head-sha: description: 'The commit SHA of the pull request branch.' runs: - using: 'node12' + using: 'node16' main: 'dist/index.js' branding: icon: 'git-pull-request' diff --git a/dist/index.js b/dist/index.js index f4a2a38..790a920 100644 --- a/dist/index.js +++ b/dist/index.js @@ -122,20 +122,25 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName const tempBranch = (0, uuid_1.v4)(); yield git.checkout(tempBranch, 'HEAD'); // Commit any uncommitted changes - if (yield git.isDirty(true)) { + if (yield git.isDirty(true, addPaths)) { core.info('Uncommitted changes found. Adding a commit.'); - for (const path of addPaths) { - yield git.exec(['add', path], true); + const aopts = ['add']; + if (addPaths.length > 0) { + aopts.push(...['--', ...addPaths]); } - const params = ['-m', commitMessage]; + else { + aopts.push('-A'); + } + yield git.exec(aopts, true); + const popts = ['-m', commitMessage]; if (signoff) { - params.push('--signoff'); + popts.push('--signoff'); } - yield git.commit(params); - // Remove uncommitted tracked and untracked changes - yield git.exec(['reset', '--hard']); - yield git.exec(['clean', '-f']); + yield git.commit(popts); } + // Remove uncommitted tracked and untracked changes + yield git.exec(['reset', '--hard']); + yield git.exec(['clean', '-f', '-d']); // Perform fetch and reset the working base // Commits made during the workflow will be removed if (workingBaseType == WorkingBaseType.Branch) { @@ -752,18 +757,23 @@ class GitCommandManager { return output.exitCode === 1; }); } - isDirty(untracked) { + isDirty(untracked, pathspec) { return __awaiter(this, void 0, void 0, function* () { + const pathspecArgs = pathspec ? ['--', ...pathspec] : []; // Check untracked changes - if (untracked && (yield this.status(['--porcelain', '-unormal']))) { + const sargs = ['--porcelain', '-unormal']; + sargs.push(...pathspecArgs); + if (untracked && (yield this.status(sargs))) { return true; } // Check working index changes - if (yield this.hasDiff()) { + if (yield this.hasDiff(pathspecArgs)) { return true; } // Check staged changes - if (yield this.hasDiff(['--staged'])) { + const dargs = ['--staged']; + dargs.push(...pathspecArgs); + if (yield this.hasDiff(dargs)) { return true; } return false; @@ -1085,9 +1095,9 @@ function run() { commitMessage: core.getInput('commit-message'), committer: core.getInput('committer'), author: core.getInput('author'), - signoff: core.getInput('signoff') === 'true', + signoff: core.getBooleanInput('signoff'), branch: core.getInput('branch'), - deleteBranch: core.getInput('delete-branch') === 'true', + deleteBranch: core.getBooleanInput('delete-branch'), branchSuffix: core.getInput('branch-suffix'), base: core.getInput('base'), pushToFork: core.getInput('push-to-fork'), @@ -1098,7 +1108,7 @@ function run() { reviewers: utils.getInputAsArray('reviewers'), teamReviewers: utils.getInputAsArray('team-reviewers'), milestone: Number(core.getInput('milestone')), - draft: core.getInput('draft') === 'true' + draft: core.getBooleanInput('draft') }; core.debug(`Inputs: ${(0, util_1.inspect)(inputs)}`); yield (0, create_pull_request_1.createPullRequest)(inputs); diff --git a/report.txt b/report.txt new file mode 100644 index 0000000..a30d84f --- /dev/null +++ b/report.txt @@ -0,0 +1 @@ +1647920777