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

formatting

Browse source
This commit is contained in:
Peter Evans 2024-07-25 13:30:47 +00:00
parent 70815fee7e
commit 5bb83f1307
4 changed files with 62 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dist/index.js vendored
View file

@ -439,17 +439,17 @@ function createPullRequest(inputs) {
core.info(`Use API to push a signed commit`);
const graphqlWithAuth = graphql_1.graphql.defaults({
headers: {
authorization: 'token ' + inputs.token,
},
authorization: 'token ' + inputs.token
}
});
let repoOwner = process.env.GITHUB_REPOSITORY.split("/")[0];
let repoOwner = process.env.GITHUB_REPOSITORY.split('/')[0];
if (inputs.pushToFork) {
const forkName = yield githubHelper.getRepositoryParent(baseRemote.repository);
if (!forkName) {
repoOwner = forkName;
}
}
const repoName = process.env.GITHUB_REPOSITORY.split("/")[1];
const repoName = process.env.GITHUB_REPOSITORY.split('/')[1];
core.debug(`repoOwner: '${repoOwner}', repoName: '${repoName}'`);
const refQuery = `
query GetRefId($repoName: String!, $repoOwner: String!, $branchName: String!) {
@ -522,12 +522,12 @@ function createPullRequest(inputs) {
for (var file of changedFiles) {
fileChanges.additions.push({
path: file,
contents: btoa(fs.readFileSync(file, 'utf8')),
contents: btoa(fs.readFileSync(file, 'utf8'))
});
}
for (var file of deletedFiles) {
fileChanges.deletions.push({
path: file,
path: file
});
}
const pushCommitMutation = `
@ -568,7 +568,7 @@ function createPullRequest(inputs) {
repoNameWithOwner: repoOwner + '/' + repoName,
headOid: branchRef.repository.ref.target.oid,
commitMessage: inputs.commitMessage,
fileChanges: fileChanges,
fileChanges: fileChanges
};
core.info(`Push commit with payload: '${JSON.stringify(pushCommitVars)}'`);
const commit = yield graphqlWithAuth(pushCommitMutation, pushCommitVars);
@ -828,7 +828,7 @@ class GitCommandManager {
}
args.push(ref);
const output = yield this.exec(args);
return output.stdout.split("\n").filter((filename) => filename != '');
return output.stdout.split('\n').filter(filename => filename != '');
});
}
isDirty(untracked, pathspec) {
@ -1428,7 +1428,7 @@ function run() {
teamReviewers: utils.getInputAsArray('team-reviewers'),
milestone: Number(core.getInput('milestone')),
draft: core.getBooleanInput('draft'),
signCommit: core.getBooleanInput('sign-commit'),
signCommit: core.getBooleanInput('sign-commit')
};
core.debug(`Inputs: ${(0, util_1.inspect)(inputs)}`);
if (!inputs.token) {

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

@ -1,7 +1,7 @@
import * as core from '@actions/core'
import * as fs from 'fs'
import { graphql } from '@octokit/graphql'
import type {
import {graphql} from '@octokit/graphql'
import type {
Repository,
Ref,
Commit,
@ -205,16 +205,20 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
core.info(`Use API to push a signed commit`)
const graphqlWithAuth = graphql.defaults({
headers: {
authorization: 'token ' + inputs.token,
},
});
authorization: 'token ' + inputs.token
}
})
let repoOwner = process.env.GITHUB_REPOSITORY!.split("/")[0]
let repoOwner = process.env.GITHUB_REPOSITORY!.split('/')[0]
if (inputs.pushToFork) {
const forkName = await githubHelper.getRepositoryParent(baseRemote.repository)
if (!forkName) { repoOwner = forkName! }
const forkName = await githubHelper.getRepositoryParent(
baseRemote.repository
)
if (!forkName) {
repoOwner = forkName!
}
}
const repoName = process.env.GITHUB_REPOSITORY!.split("/")[1]
const repoName = process.env.GITHUB_REPOSITORY!.split('/')[1]
core.debug(`repoOwner: '${repoOwner}', repoName: '${repoName}'`)
const refQuery = `
@ -245,11 +249,13 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
branchName: inputs.branch
}
)
core.debug( `Fetched information for branch '${inputs.branch}' - '${JSON.stringify(branchRef)}'`)
core.debug(
`Fetched information for branch '${inputs.branch}' - '${JSON.stringify(branchRef)}'`
)
// if the branch does not exist, then first we need to create the branch from base
if (branchRef.repository.ref == null) {
core.debug( `Branch does not exist - '${inputs.branch}'`)
core.debug(`Branch does not exist - '${inputs.branch}'`)
branchRef = await graphqlWithAuth<{repository: Repository}>(
refQuery,
{
@ -258,11 +264,15 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
branchName: inputs.base
}
)
core.debug( `Fetched information for base branch '${inputs.base}' - '${JSON.stringify(branchRef)}'`)
core.debug(
`Fetched information for base branch '${inputs.base}' - '${JSON.stringify(branchRef)}'`
)
core.info( `Creating new branch '${inputs.branch}' from '${inputs.base}', with ref '${JSON.stringify(branchRef.repository.ref!.target!.oid)}'`)
core.info(
`Creating new branch '${inputs.branch}' from '${inputs.base}', with ref '${JSON.stringify(branchRef.repository.ref!.target!.oid)}'`
)
if (branchRef.repository.ref != null) {
core.debug( `Send request for creating new branch`)
core.debug(`Send request for creating new branch`)
const newBranchMutation = `
mutation CreateNewBranch($branchName: String!, $oid: GitObjectID!, $repoId: ID!) {
createRef(input: {
@ -286,16 +296,26 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
branchName: 'refs/heads/' + inputs.branch
}
)
core.debug(`Created new branch '${inputs.branch}': '${JSON.stringify(newBranch.createRef.ref)}'`)
core.debug(
`Created new branch '${inputs.branch}': '${JSON.stringify(newBranch.createRef.ref)}'`
)
}
}
core.info( `Hash ref of branch '${inputs.branch}' is '${JSON.stringify(branchRef.repository.ref!.target!.oid)}'`)
core.info(
`Hash ref of branch '${inputs.branch}' is '${JSON.stringify(branchRef.repository.ref!.target!.oid)}'`
)
// switch to input-branch for reading updated file contents
await git.checkout(inputs.branch)
let changedFiles = await git.getChangedFiles(branchRef.repository.ref!.target!.oid, ['--diff-filter=M'])
let deletedFiles = await git.getChangedFiles(branchRef.repository.ref!.target!.oid, ['--diff-filter=D'])
let changedFiles = await git.getChangedFiles(
branchRef.repository.ref!.target!.oid,
['--diff-filter=M']
)
let deletedFiles = await git.getChangedFiles(
branchRef.repository.ref!.target!.oid,
['--diff-filter=D']
)
let fileChanges = <FileChanges>{additions: [], deletions: []}
core.debug(`Changed files: '${JSON.stringify(changedFiles)}'`)
@ -304,13 +324,13 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
for (var file of changedFiles) {
fileChanges.additions!.push({
path: file,
contents: btoa(fs.readFileSync(file, 'utf8')),
contents: btoa(fs.readFileSync(file, 'utf8'))
})
}
for (var file of deletedFiles) {
fileChanges.deletions!.push({
path: file,
path: file
})
}
@ -352,22 +372,24 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
repoNameWithOwner: repoOwner + '/' + repoName,
headOid: branchRef.repository.ref!.target!.oid,
commitMessage: inputs.commitMessage,
fileChanges: fileChanges,
fileChanges: fileChanges
}
core.info(`Push commit with payload: '${JSON.stringify(pushCommitVars)}'`)
core.info(
`Push commit with payload: '${JSON.stringify(pushCommitVars)}'`
)
const commit = await graphqlWithAuth<{createCommitOnBranch: {ref: Ref, commit: Commit} }>(
pushCommitMutation,
pushCommitVars,
);
const commit = await graphqlWithAuth<{
createCommitOnBranch: {ref: Ref; commit: Commit}
}>(pushCommitMutation, pushCommitVars)
core.debug( `Pushed commit - '${JSON.stringify(commit)}'`)
core.info( `Pushed commit with hash - '${commit.createCommitOnBranch.commit.oid}' on branch - '${commit.createCommitOnBranch.ref.name}'`)
core.debug(`Pushed commit - '${JSON.stringify(commit)}'`)
core.info(
`Pushed commit with hash - '${commit.createCommitOnBranch.commit.oid}' on branch - '${commit.createCommitOnBranch.ref.name}'`
)
// switch back to previous branch/state since we are done with reading the changed file contents
await git.checkout('-')
} else {
await git.push([
'--force-with-lease',

2
src/git-command-manager.ts
View file

@ -173,7 +173,7 @@ export class GitCommandManager {
}
args.push(ref)
const output = await this.exec(args)
return output.stdout.split("\n").filter((filename) => filename != '')
return output.stdout.split('\n').filter(filename => filename != '')
}
async isDirty(untracked: boolean, pathspec?: string[]): Promise<boolean> {

2
src/main.ts
View file

@ -28,7 +28,7 @@ async function run(): Promise<void> {
teamReviewers: utils.getInputAsArray('team-reviewers'),
milestone: Number(core.getInput('milestone')),
draft: core.getBooleanInput('draft'),
signCommit: core.getBooleanInput('sign-commit'),
signCommit: core.getBooleanInput('sign-commit')
}
core.debug(`Inputs: ${inspect(inputs)}`)