mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-03-15 14:05:47 -05:00
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
This commit is contained in:
4
.github/pull_request_template.md
vendored
4
.github/pull_request_template.md
vendored
@@ -3,12 +3,12 @@ Thank you for submitting a pull request!
|
||||
|
||||
Please verify that:
|
||||
* [ ] There is an associated issue in the `Backlog` milestone (**required**)
|
||||
* [ ] Code is up-to-date with the `master` branch
|
||||
* [ ] Code is up-to-date with the `main` branch
|
||||
* [ ] You've successfully run `gulp runtests` locally
|
||||
* [ ] There are new or updated unit tests validating the change
|
||||
|
||||
Refer to CONTRIBUTING.MD for more details.
|
||||
https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md
|
||||
https://github.com/Microsoft/TypeScript/blob/main/CONTRIBUTING.md
|
||||
-->
|
||||
|
||||
Fixes #
|
||||
|
||||
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@@ -3,11 +3,11 @@ name: CI
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
- release-*
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
- release-*
|
||||
|
||||
jobs:
|
||||
|
||||
4
.github/workflows/sync-branch.yaml
vendored
4
.github/workflows/sync-branch.yaml
vendored
@@ -28,8 +28,8 @@ jobs:
|
||||
- run: |
|
||||
git config user.email "typescriptbot@microsoft.com"
|
||||
git config user.name "TypeScript Bot"
|
||||
git fetch origin master
|
||||
git merge origin/master --no-ff
|
||||
git fetch origin main
|
||||
git merge origin/main --no-ff
|
||||
npm ci
|
||||
npm test
|
||||
git push
|
||||
|
||||
Reference in New Issue
Block a user