diff --git a/dev-infra/ng-dev.js b/dev-infra/ng-dev.js index fe7ff2bf05..1ce1b0340e 100755 --- a/dev-infra/ng-dev.js +++ b/dev-infra/ng-dev.js @@ -3437,7 +3437,7 @@ function loadAndValidatePullRequest(_a, prNumber, ignoreNonFatalFailures) { if (state === 'PENDING' && !ignoreNonFatalFailures) { return [2 /*return*/, PullRequestFailure.pendingCiJobs()]; } - githubTargetBranch = prData.baseRefOid; + githubTargetBranch = prData.baseRefName; requiredBaseSha = config.requiredBaseCommits && config.requiredBaseCommits[githubTargetBranch]; needsCommitMessageFixup = !!config.commitMessageFixupLabel && labels.some(function (name) { return matchesPattern(name, config.commitMessageFixupLabel); }); @@ -3489,7 +3489,7 @@ var PR_SCHEMA$2 = { }, }], }), - baseRefOid: typedGraphqlify.types.string, + baseRefName: typedGraphqlify.types.string, title: typedGraphqlify.types.string, labels: typedGraphqlify.params({ first: 100 }, { nodes: [{ diff --git a/dev-infra/pr/merge/pull-request.ts b/dev-infra/pr/merge/pull-request.ts index 4b80a543c4..c79435103d 100644 --- a/dev-infra/pr/merge/pull-request.ts +++ b/dev-infra/pr/merge/pull-request.ts @@ -92,7 +92,7 @@ export async function loadAndValidatePullRequest( return PullRequestFailure.pendingCiJobs(); } - const githubTargetBranch = prData.baseRefOid; + const githubTargetBranch = prData.baseRefName; const requiredBaseSha = config.requiredBaseCommits && config.requiredBaseCommits[githubTargetBranch]; const needsCommitMessageFixup = !!config.commitMessageFixupLabel && @@ -145,7 +145,7 @@ const PR_SCHEMA = { }, }], }), - baseRefOid: graphQLTypes.string, + baseRefName: graphQLTypes.string, title: graphQLTypes.string, labels: params({first: 100}, { nodes: [{