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

fix head sha output

Browse source
This commit is contained in:
Peter Evans 2024-08-15 10:16:22 +00:00
parent 5a9be5875b
commit eea4f44785
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dist/index.js vendored
View file

@ -452,6 +452,7 @@ function createPullRequest(inputs) {
core.endGroup(); core.endGroup();
// Action outputs // Action outputs
const outputs = new Map(); const outputs = new Map();
outputs.set('pull-request-branch', inputs.branch);
outputs.set('pull-request-commits-verified', 'false'); outputs.set('pull-request-commits-verified', 'false');
// 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');
@ -485,10 +486,8 @@ function createPullRequest(inputs) {
core.endGroup(); core.endGroup();
} }
if (result.hasDiffWithBase) { if (result.hasDiffWithBase) {
// Create or update the pull request
core.startGroup('Create or update the pull request'); core.startGroup('Create or update the pull request');
const pull = yield githubHelper.createOrUpdatePullRequest(inputs, baseRemote.repository, branchRepository); const pull = yield githubHelper.createOrUpdatePullRequest(inputs, baseRemote.repository, branchRepository);
core.endGroup();
outputs.set('pull-request-number', pull.number.toString()); outputs.set('pull-request-number', pull.number.toString());
outputs.set('pull-request-url', pull.html_url); outputs.set('pull-request-url', pull.html_url);
if (pull.created) { if (pull.created) {
@ -497,10 +496,9 @@ function createPullRequest(inputs) {
else if (result.action == 'updated') { else if (result.action == 'updated') {
outputs.set('pull-request-operation', 'updated'); outputs.set('pull-request-operation', 'updated');
} }
outputs.set('pull-request-head-sha', result.headSha);
outputs.set('pull-request-branch', inputs.branch);
// Deprecated // Deprecated
core.exportVariable('PULL_REQUEST_NUMBER', pull.number); core.exportVariable('PULL_REQUEST_NUMBER', pull.number);
core.endGroup();
} }
else { else {
// There is no longer a diff with the base // There is no longer a diff with the base

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

@ -177,6 +177,7 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
// Action outputs // Action outputs
const outputs = new Map<string, string>() const outputs = new Map<string, string>()
outputs.set('pull-request-branch', inputs.branch)
outputs.set('pull-request-commits-verified', 'false') outputs.set('pull-request-commits-verified', 'false')
// Create or update the pull request branch // Create or update the pull request branch
@ -232,15 +233,12 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
} }
if (result.hasDiffWithBase) { if (result.hasDiffWithBase) {
// Create or update the pull request
core.startGroup('Create or update the pull request') core.startGroup('Create or update the pull request')
const pull = await githubHelper.createOrUpdatePullRequest( const pull = await githubHelper.createOrUpdatePullRequest(
inputs, inputs,
baseRemote.repository, baseRemote.repository,
branchRepository branchRepository
) )
core.endGroup()
outputs.set('pull-request-number', pull.number.toString()) outputs.set('pull-request-number', pull.number.toString())
outputs.set('pull-request-url', pull.html_url) outputs.set('pull-request-url', pull.html_url)
if (pull.created) { if (pull.created) {
@ -248,10 +246,9 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
} else if (result.action == 'updated') { } else if (result.action == 'updated') {
outputs.set('pull-request-operation', 'updated') outputs.set('pull-request-operation', 'updated')
} }
outputs.set('pull-request-head-sha', result.headSha)
outputs.set('pull-request-branch', inputs.branch)
// Deprecated // Deprecated
core.exportVariable('PULL_REQUEST_NUMBER', pull.number) core.exportVariable('PULL_REQUEST_NUMBER', pull.number)
core.endGroup()
} else { } else {
// There is no longer a diff with the base // There is no longer a diff with the base
// Check we are in a state where a branch exists // Check we are in a state where a branch exists