Skip to content

repo sync #11143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 13, 2021
Merged

repo sync #11143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f8f26c
Merge branch 'main' into repo-sync
Octomerger Oct 13, 2021
91b7cc0
Bump graphql from 15.5.3 to 15.6.1 (#22144)
dependabot[bot] Oct 13, 2021
eda9929
Branch was updated using the 'autoupdate branch' Actions workflow.
Octomerger Oct 13, 2021
c7605ca
Merge pull request #22147 from github/repo-sync
Octomerger Oct 13, 2021
0b3d04e
Handle different fork repo names when listing PRs (#22094)
rsese Oct 13, 2021
42e2f7c
Bump prettier from 2.4.0 to 2.4.1 (#22102)
dependabot[bot] Oct 13, 2021
3c72a12
Merge branch 'main' into repo-sync
Octomerger Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/staging-deploy-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,18 @@ jobs:
name: prRepoName
}
} = run
const headLabel = `${prRepoOwner}:${headBranch}`

const prIsInternal = owner === prRepoOwner && repo === prRepoName
let headLabel = `${prRepoOwner}:${headBranch}`

// If the PR is external, prefix its head branch name with the
// forked repo owner's login and their fork repo name e.g.
// "octocat/my-fork:docs". We need to include the fork repo
// name as well to account for an API issue (this will work fine
// if they don't have a different fork repo name).
if (!prIsInternal) {
headLabel = `${prRepoOwner}/${prRepoName}:${headBranch}`
}

// If the PR is external, prefix its head branch name with the
// forked repo owner's login, e.g. "octocat:docs"
Expand Down
28 changes: 14 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"eslint-plugin-promise": "^5.1.0",
"event-to-promise": "^0.8.0",
"glob": "^7.2.0",
"graphql": "^15.5.3",
"graphql": "^15.6.1",
"heroku-client": "^3.1.0",
"http-status-code": "^2.1.0",
"husky": "^7.0.2",
Expand All @@ -163,7 +163,7 @@
"npm-merge-driver-install": "^2.0.1",
"object-hash": "^2.2.0",
"postcss": "^8.3.6",
"prettier": "^2.4.0",
"prettier": "^2.4.1",
"replace": "^1.2.1",
"rimraf": "^3.0.2",
"robots-parser": "^2.3.0",
Expand Down