Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit b603a04

Browse filesBrowse files
author
Orta Therox
authored
Switch references to master to main in the codebase + validating infra post-main migration (#44347)
* Update package.json * Remove references to master in the codebase * Add more master - main
1 parent 4c01881 commit b603a04
Copy full SHA for b603a04

7 files changed

+23-23Lines changed: 23 additions & 23 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.github/pull_request_template.md‎

Copy file name to clipboardExpand all lines: .github/pull_request_template.md
+2-2Lines changed: 2 additions & 2 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Thank you for submitting a pull request!
33
44
Please verify that:
55
* [ ] There is an associated issue in the `Backlog` milestone (**required**)
6-
* [ ] Code is up-to-date with the `master` branch
6+
* [ ] Code is up-to-date with the `main` branch
77
* [ ] You've successfully run `gulp runtests` locally
88
* [ ] There are new or updated unit tests validating the change
99
1010
Refer to CONTRIBUTING.MD for more details.
11-
https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md
11+
https://github.com/Microsoft/TypeScript/blob/main/CONTRIBUTING.md
1212
-->
1313

1414
Fixes #
Collapse file

‎.github/workflows/ci.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/ci.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- release-*
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- release-*
1212

1313
jobs:
Collapse file

‎.github/workflows/sync-branch.yaml‎

Copy file name to clipboardExpand all lines: .github/workflows/sync-branch.yaml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
- run: |
2929
git config user.email "typescriptbot@microsoft.com"
3030
git config user.name "TypeScript Bot"
31-
git fetch origin master
32-
git merge origin/master --no-ff
31+
git fetch origin main
32+
git merge origin/main --no-ff
3333
npm ci
3434
npm test
3535
git push
Collapse file

‎CONTRIBUTING.md‎

Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+2-2Lines changed: 2 additions & 2 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ You will need to complete a Contributor License Agreement (CLA). Briefly, this a
102102
Your pull request should:
103103

104104
* Include a description of what your change intends to do
105-
* Be based on reasonably recent commit in the **master** branch
105+
* Be based on reasonably recent commit in the **main** branch
106106
* Include adequate tests
107107
* At least one test should fail in the absence of your non-test code changes. If your PR does not match this criteria, please specify why
108108
* Tests should include reasonable permutations of the target fix/change
@@ -118,7 +118,7 @@ There are three relevant locations to be aware of when it comes to TypeScript's
118118
* `lib`: the location of the last-known-good (LKG) versions of the files which are updated periodically.
119119
* `built/local`: the build output location, including where `src/lib` files will be copied to.
120120

121-
Any changes should be made to [src/lib](https://github.com/Microsoft/TypeScript/tree/master/src/lib). **Most** of these files can be updated by hand, with the exception of any generated files (see below).
121+
Any changes should be made to [src/lib](https://github.com/Microsoft/TypeScript/tree/main/src/lib). **Most** of these files can be updated by hand, with the exception of any generated files (see below).
122122

123123
Library files in `built/local/` are updated automatically by running the standard build task:
124124

Collapse file

‎README.md‎

Copy file name to clipboardExpand all lines: README.md
+4-4Lines changed: 4 additions & 4 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ npm install -g typescript@next
2626

2727
## Contribute
2828

29-
There are many ways to [contribute](https://github.com/microsoft/TypeScript/blob/master/CONTRIBUTING.md) to TypeScript.
29+
There are many ways to [contribute](https://github.com/microsoft/TypeScript/blob/main/CONTRIBUTING.md) to TypeScript.
3030
* [Submit bugs](https://github.com/microsoft/TypeScript/issues) and help us verify fixes as they are checked in.
3131
* Review the [source code changes](https://github.com/microsoft/TypeScript/pulls).
3232
* Engage with other TypeScript users and developers on [StackOverflow](https://stackoverflow.com/questions/tagged/typescript).
3333
* Help each other in the [TypeScript Community Discord](https://discord.gg/typescript).
3434
* Join the [#typescript](https://twitter.com/search?q=%23TypeScript) discussion on Twitter.
35-
* [Contribute bug fixes](https://github.com/microsoft/TypeScript/blob/master/CONTRIBUTING.md).
36-
* Read the archived language specification ([docx](https://github.com/microsoft/TypeScript/blob/master/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.docx?raw=true),
37-
[pdf](https://github.com/microsoft/TypeScript/blob/master/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.pdf?raw=true), [md](https://github.com/microsoft/TypeScript/blob/master/doc/spec-ARCHIVED.md)).
35+
* [Contribute bug fixes](https://github.com/microsoft/TypeScript/blob/main/CONTRIBUTING.md).
36+
* Read the archived language specification ([docx](https://github.com/microsoft/TypeScript/blob/main/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.docx?raw=true),
37+
[pdf](https://github.com/microsoft/TypeScript/blob/main/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.pdf?raw=true), [md](https://github.com/microsoft/TypeScript/blob/main/doc/spec-ARCHIVED.md)).
3838

3939
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see
4040
the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com)
Collapse file

‎scripts/open-user-pr.ts‎

Copy file name to clipboardExpand all lines: scripts/open-user-pr.ts
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ const userName = process.env.GH_USERNAME || "typescript-bot";
88
const reviewers = process.env.REQUESTING_USER ? [process.env.REQUESTING_USER] : ["weswigham", "sandersn", "RyanCavanaugh"];
99
const now = new Date();
1010
const masterBranchname = `user-baseline-updates`;
11-
const targetBranch = process.env.TARGET_BRANCH || "master";
12-
const branchName = process.env.TARGET_FORK?.toLowerCase() === "microsoft" && (targetBranch === "master" || targetBranch === "refs/heads/master")
11+
const targetBranch = process.env.TARGET_BRANCH || "main";
12+
const branchName = process.env.TARGET_FORK?.toLowerCase() === "microsoft" && (targetBranch === "main" || targetBranch === "refs/heads/main")
1313
? masterBranchname
1414
: `user-update-${process.env.TARGET_FORK}-${process.env.TARGET_BRANCH ? "-" + process.env.TARGET_BRANCH : ""}`;
1515
const remoteUrl = `https://${process.argv[2]}@github.com/${userName}/TypeScript.git`;
16-
const baseRef = branchName === masterBranchname ? "master" : masterBranchname;
16+
const baseRef = branchName === masterBranchname ? "main" : masterBranchname;
1717
runSequence([
1818
["git", ["remote", "add", "fork", remoteUrl]], // Add the remote fork
1919
["git", ["checkout", "."]], // reset any changes
20-
["git", ["fetch", baseRef === "master" ? "origin" : "fork", baseRef]], // fetch target ref in case it's not present locally
20+
["git", ["fetch", baseRef === "main" ? "origin" : "fork", baseRef]], // fetch target ref in case it's not present locally
2121
["git", ["checkout", baseRef]], // move head to target
2222
["node", ["./node_modules/gulp/bin/gulp.js", "baseline-accept"]], // accept baselines
2323
["git", ["checkout", "-b", branchName]], // create a branch
@@ -36,7 +36,7 @@ gh.pulls.create({
3636
maintainer_can_modify: true,
3737
title: `🤖 User test baselines have changed` + (process.env.TARGET_BRANCH ? ` for ${process.env.TARGET_BRANCH}` : ""),
3838
head: `${userName}:${branchName}`,
39-
base: branchName === masterBranchname ? "master" : masterBranchname,
39+
base: branchName === masterBranchname ? "main" : masterBranchname,
4040
body:
4141
`${process.env.SOURCE_ISSUE ? `This test run was triggerd by a request on https://github.com/Microsoft/TypeScript/pull/${process.env.SOURCE_ISSUE} `+"\n" : ""}Please review the diff and merge if no changes are unexpected.
4242
You can view the build log [here](https://typescript.visualstudio.com/TypeScript/_build/index?buildId=${process.env.BUILD_BUILDID}&_a=summary).
Collapse file

‎scripts/update-experimental-branches.js‎

Copy file name to clipboardExpand all lines: scripts/update-experimental-branches.js
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ async function main() {
3434
// Forcibly cleanup workspace
3535
runSequence([
3636
["git", ["checkout", "."]],
37-
["git", ["fetch", "-fu", "origin", "master:master"]],
38-
["git", ["checkout", "master"]],
37+
["git", ["fetch", "-fu", "origin", "main:main"]],
38+
["git", ["checkout", "main"]],
3939
["git", ["remote", "add", "fork", remoteUrl]], // Add the remote fork
4040
]);
4141

@@ -51,15 +51,15 @@ async function main() {
5151
owner: "Microsoft",
5252
repo: "TypeScript",
5353
issue_number: num,
54-
body: `This PR is configured as an experiment, and currently has rebase conflicts with master - please rebase onto master and fix the conflicts.`
54+
body: `This PR is configured as an experiment, and currently has rebase conflicts with main - please rebase onto main and fix the conflicts.`
5555
});
5656
}
57-
throw new Error(`Rebase conflict detected in PR ${num} with master`); // A PR is currently in conflict, give up
57+
throw new Error(`Rebase conflict detected in PR ${num} with main`); // A PR is currently in conflict, give up
5858
}
5959
runSequence([
6060
["git", ["fetch", "origin", `pull/${num}/head:${num}`]],
6161
["git", ["checkout", `${num}`]],
62-
["git", ["rebase", "master"]],
62+
["git", ["rebase", "main"]],
6363
["git", ["push", "-f", "-u", "fork", `${num}`]], // Keep a rebased copy of this branch in our fork
6464
]);
6565

@@ -71,7 +71,7 @@ async function main() {
7171

7272
// Return to `master` and make a new `experimental` branch
7373
runSequence([
74-
["git", ["checkout", "master"]],
74+
["git", ["checkout", "main"]],
7575
["git", ["checkout", "-b", "experimental"]],
7676
]);
7777

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.