Skip to content
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.

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

Default branch rename #197

Merged
merged 1 commit into from
Jan 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion COMMITTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

## General

Each change needs to result in a single commit on the master branch, with no merge commits. The green squash and merge button is OK to use, but be sure to tidy up the commit message per the below guidelines. In particular, if you use the squash functionality, delete the parenthetical pull request number that GitHub adds.
Each change needs to result in a single commit on the main branch, with no merge commits. The green squash and merge button is OK to use, but be sure to tidy up the commit message per the below guidelines. In particular, if you use the squash functionality, delete the parenthetical pull request number that GitHub adds.

## Commit messages

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Other Make targets are also available:
* `make deploy` will do a full "deploy" of the standard, including error checking, commit snapshot production, any extra build steps, into a local subdirectory.
* `make local` will do a local build, without calling out to any web services. This requires having [Bikeshed](https://github.com/tabatkins/bikeshed) installed locally.

Due to its large size, the HTML Standard has its own build process, which you can read about in the [html-build repository](https://github.com/whatwg/html-build/blob/master/README.md).
Due to its large size, the HTML Standard has its own build process, which you can read about in the [html-build repository](https://github.com/whatwg/html-build/blob/main/README.md).

## Tests

Expand Down
2 changes: 1 addition & 1 deletion GITHUB-TEAMS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ In order to ease notifying folks with a common expertise or interest, the WHATWG

* Anyone can join any team they desire. To join just let someone know or [file an issue](https://github.com/whatwg/meta/issues/new).
* Everyone tries to ensure the appropriate teams are [mentioned](https://github.com/blog/1121-introducing-team-mentions) on relevant issues/pull requests.
* Teams have no formal authority, though we might add them as contributors to repositories for ease of collaboration. For all repositories we care about protecting master primarily. The bar for write access to other branches is much much lower.
* Teams have no formal authority, though we might add them as contributors to repositories for ease of collaboration. For all repositories we care about protecting the main branch primarily. The bar for write access to other branches is much much lower.
* Teams have no responsibility either. If you ping a team and get no feedback, moving things forward responsibly is still on you.
* To propose a new team, [file an issue](https://github.com/whatwg/meta/issues/new). We will approve most teams unless they are a niche or overlap with an existing team.

Expand Down
4 changes: 2 additions & 2 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Furthermore, for changes affecting one or more implementations, ensure implement

For new features, or substantial changes to existing features, please notify the documentation team. Use the `impacts documentation` label and copy the `@whatwg/documentation` team on the PR or issue. They will help make the appropriate changes on [MDN web docs](https://developer.mozilla.org/).

### Merging pull requests into master
### Merging pull requests

Use the green button on the PR page in the GitHub Web UI:

Expand Down Expand Up @@ -80,7 +80,7 @@ Per the [Workstream Policy](https://whatwg.org/workstream-policy#review-drafts),

To accomplish this the `review.py` script is used, this:

1. Runs `make review` for each draft scheduled to be published that month as per [db.json](https://github.com/whatwg/sg/blob/master/db.json).
1. Runs `make review` for each draft scheduled to be published that month as per [db.json](https://github.com/whatwg/sg/blob/main/db.json).
1. Creates a pull request for the changes. The pull request body will be:
```markdown
A MONTH YEAR Review Draft (linked) for this Workstream will be published shortly after merging this pull request.
Expand Down
2 changes: 1 addition & 1 deletion labels.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def main():
# It would be slightly neater to instead pull the repositories from a JSON resource so this
# script would remain WHATWG-agnostic, but we don't have a good JSON resource for this so
# far.
db = fetch_json("https://github.com/whatwg/sg/raw/master/db.json")
db = fetch_json("https://github.com/whatwg/sg/raw/main/db.json")
for repository in find_shortnames(db["workstreams"]):
# Give a little bit of output as otherwise it's hard to tell what's going on
print("About to process", repository)
Expand Down
8 changes: 4 additions & 4 deletions review.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def maybe_create_prs(shortnames):
os.chdir(".")

def maybe_create_pr(shortname):
subprocess.run(["git", "checkout", "master"], capture_output=True)
subprocess.run(["git", "checkout", "main"], capture_output=True)
commits = subprocess.run(["git", "log", "--format=%s", "--max-count=40"], capture_output=True).stdout
for subject in commits.split(b"\n"):
if subject.startswith(b"Meta:"):
Expand All @@ -66,8 +66,8 @@ def maybe_create_pr(shortname):
path_month = today.strftime("%Y-%m")

# We should consider merging
# https://github.com/whatwg/whatwg.org/blob/master/resources.whatwg.org/build/review.sh and
# https://github.com/whatwg/html/blob/master/review-draft.sh into this script.
# https://github.com/whatwg/whatwg.org/blob/main/resources.whatwg.org/build/review.sh and
# https://github.com/whatwg/html/blob/main/review-draft.sh into this script.
subprocess.run(["make", "review"])

# This is straight from MAINTAINERS.md and needs to be kept in sync with that.
Expand Down Expand Up @@ -99,7 +99,7 @@ def main():
print("It's 3 days after publication, hopefully you already published. Use --force to ignore.")
exit(1)

db = fetch_json("https://github.com/whatwg/sg/raw/master/db.json")
db = fetch_json("https://github.com/whatwg/sg/raw/main/db.json")
shortnames = find_shortnames(db["workstreams"], today.month)

if len(shortnames) == 0:
Expand Down