jiriks74/create-pull-request
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[CI] test built

Browse source
This commit is contained in:
peter-evans 2020-12-23 04:46:13 +00:00 • committed by GitHub
parent 6c2b44c6ac
commit 9b632d8eba
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dist/index.js vendored
View file

@ -134,8 +134,9 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
// Perform fetch and reset the working base // Perform fetch and reset the working base
// Commits made during the workflow will be removed // Commits made during the workflow will be removed
if (workingBaseType == WorkingBaseType.Branch) { if (workingBaseType == WorkingBaseType.Branch) {
core.info(`Resetting working base branch '${workingBase}' to its remote`); core.info(`Resetting working base branch '${workingBase}'`);
yield git.fetch([`${workingBase}:${workingBase}`], baseRemote, ['--force']); yield git.checkout(workingBase);
yield git.exec(['reset', '--hard', `${baseRemote}/${workingBase}`]);
} }
// If the working base is not the base, rebase the temp branch commits // If the working base is not the base, rebase the temp branch commits
// This will also be true if the working base type is a commit // This will also be true if the working base type is a commit
@ -162,7 +163,7 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
// The pull request branch does not exist // The pull request branch does not exist
core.info(`Pull request branch '${branch}' does not exist yet.`); core.info(`Pull request branch '${branch}' does not exist yet.`);
// Create the pull request branch // Create the pull request branch
yield git.checkout(branch, 'HEAD'); yield git.checkout(branch, tempBranch);
// Check if the pull request branch is ahead of the base // Check if the pull request branch is ahead of the base
result.hasDiffWithBase = yield isAhead(git, base, branch); result.hasDiffWithBase = yield isAhead(git, base, branch);
if (result.hasDiffWithBase) { if (result.hasDiffWithBase) {

1
report.txt Normal file
View file

@ -0,0 +1 @@
1608698772