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

shift setting the base to before the push

Browse source
This commit is contained in:
Peter Evans 2024-07-25 14:47:48 +00:00
parent 081c241f6e
commit 13c3ab4d5e
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/index.js vendored
View file

@ -431,6 +431,8 @@ function createPullRequest(inputs) {
// Create or update the pull request branch // Create or update the pull request branch
core.startGroup('Create or update the pull request branch'); core.startGroup('Create or update the pull request branch');
const result = yield (0, create_or_update_branch_1.createOrUpdateBranch)(git, inputs.commitMessage, inputs.base, inputs.branch, branchRemoteName, inputs.signoff, inputs.addPaths); const result = yield (0, create_or_update_branch_1.createOrUpdateBranch)(git, inputs.commitMessage, inputs.base, inputs.branch, branchRemoteName, inputs.signoff, inputs.addPaths);
// Set the base. It would have been '' if not specified as an input
inputs.base = result.base;
core.endGroup(); core.endGroup();
if (['created', 'updated'].includes(result.action)) { if (['created', 'updated'].includes(result.action)) {
// The branch was created or updated // The branch was created or updated
@ -586,8 +588,6 @@ function createPullRequest(inputs) {
} }
core.endGroup(); core.endGroup();
} }
// Set the base. It would have been '' if not specified as an input
inputs.base = result.base;
if (result.hasDiffWithBase) { if (result.hasDiffWithBase) {
// Create or update the pull request // Create or update the pull request
core.startGroup('Create or update the pull request'); core.startGroup('Create or update the pull request');

5
src/create-pull-request.ts
View file

@ -194,6 +194,8 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
inputs.signoff, inputs.signoff,
inputs.addPaths inputs.addPaths
) )
// Set the base. It would have been '' if not specified as an input
inputs.base = result.base
core.endGroup() core.endGroup()
if (['created', 'updated'].includes(result.action)) { if (['created', 'updated'].includes(result.action)) {
@ -400,9 +402,6 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
core.endGroup() core.endGroup()
} }
// Set the base. It would have been '' if not specified as an input
inputs.base = result.base
if (result.hasDiffWithBase) { if (result.hasDiffWithBase) {
// Create or update the pull request // Create or update the pull request
core.startGroup('Create or update the pull request') core.startGroup('Create or update the pull request')