From 5519027600a195d105d0e033a650a82157ed96b6 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 17 Jul 2020 06:43:50 -0700 Subject: [PATCH] Minor fixes to consmetic build issues in user test PR script --- scripts/open-user-pr.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/open-user-pr.ts b/scripts/open-user-pr.ts index 04cace3e698..49fda38a4f6 100644 --- a/scripts/open-user-pr.ts +++ b/scripts/open-user-pr.ts @@ -2,14 +2,14 @@ /// // Must reference esnext.asynciterable lib, since octokit uses AsyncIterable internally import { Octokit } from "@octokit/rest"; -import {runSequence} from "./run-sequence"; +const {runSequence} = require("./run-sequence"); -const userName = process.env.GH_USERNAME; +const userName = process.env.GH_USERNAME || "typescript-bot"; const reviewers = process.env.REQUESTING_USER ? [process.env.REQUESTING_USER] : ["weswigham", "sandersn", "RyanCavanaugh"]; const now = new Date(); const masterBranchname = `user-baseline-updates`; const targetBranch = process.env.TARGET_BRANCH || "master"; -const branchName = process.env.TARGET_FORK.toLowerCase() === "microsoft" && (targetBranch === "master" || targetBranch === "refs/heads/master") +const branchName = process.env.TARGET_FORK?.toLowerCase() === "microsoft" && (targetBranch === "master" || targetBranch === "refs/heads/master") ? masterBranchname : `user-update-${process.env.TARGET_FORK}-${process.env.TARGET_BRANCH ? "-" + process.env.TARGET_BRANCH : ""}`; const remoteUrl = `https://${process.argv[2]}@github.com/${userName}/TypeScript.git`; @@ -46,7 +46,7 @@ cc ${reviewers.map(r => "@" + r).join(" ")}`, const num = r.data.number; console.log(`Pull request ${num} created.`); if (!process.env.SOURCE_ISSUE) { - await gh.pulls.createReviewRequest({ + await gh.pulls.requestReviewers({ owner: prOwner, repo: "TypeScript", pull_number: num,