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

[CI] test built

Browse Source
This commit is contained in:
peter-evans 2024-04-12 09:00:34 +00:00 committed by github-actions[bot]
parent 6ce4eca6b6
commit 635442e72b
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/index.js vendored
View File

@ -164,20 +164,12 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
} }
// Stash any uncommitted tracked and untracked changes // Stash any uncommitted tracked and untracked changes
const stashed = yield git.stashPush(['--include-untracked']); const stashed = yield git.stashPush(['--include-untracked']);
// Perform fetch and reset the working base // 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}'`); core.info(`Resetting working base branch '${workingBase}'`);
if (branchRemoteName == 'fork') { yield git.checkout(workingBase);
// If pushing to a fork we must fetch with 'unshallow' to avoid the following error on git push yield git.exec(['reset', '--hard', `${baseRemote}/${workingBase}`]);
// ! [remote rejected] HEAD -> tests/push-branch-to-fork (shallow update not allowed)
yield git.fetch([`${workingBase}:${workingBase}`], baseRemote, ['--force'], true);
}
else {
// If the remote is 'origin' we can git reset
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

1
report.txt Normal file
View File

@ -0,0 +1 @@
1712912433