cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dev-infra): integrate merge script into ng-dev cli (#37138)

Browse Source 
Integrates the merge script into the `ng-dev` CLI. The goal is that
caretakers can run the same command across repositories to merge a pull
request. The command is as followed: `yarn ng-dev pr merge <number>`.

PR Close #37138
This commit is contained in:
Paul Gschwendtner
2020-05-15 17:21:01 +02:00
committed by Kara Erickson
parent 318e9372c9
commit 8a3493af47
16 changed files with 237 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-infra/pr/merge/pull-request.ts
View File

@ -62,7 +62,7 @@ export async function loadAndValidatePullRequest(
}
const {data: {state}} =
await git.api.repos.getCombinedStatusForRef({...git.repoParams, ref: prData.head.sha});
await git.api.repos.getCombinedStatusForRef({...git.remoteParams, ref: prData.head.sha});
if (state === 'failure' && !ignoreNonFatalFailures) {
return PullRequestFailure.failingCiJobs();
@ -93,7 +93,7 @@ export async function loadAndValidatePullRequest(
async function fetchPullRequestFromGithub(
git: GitClient, prNumber: number): Promise<Octokit.PullsGetResponse|null> {
try {
const result = await git.api.pulls.get({...git.repoParams, pull_number: prNumber});
const result = await git.api.pulls.get({...git.remoteParams, pull_number: prNumber});
return result.data;
} catch (e) {
// If the pull request could not be found, we want to return `null` so