Skip to content

Commit

Permalink
Make "main" branch the default branch (#324)
Browse files Browse the repository at this point in the history
  • Loading branch information
tidoust authored Jul 2, 2021
1 parent d3101bc commit 02e1349
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/candidate-specs.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ title: New specs for review
assignees: tidoust, dontcallmedom, sideshowbarker
labels: enhancement
---
[find-specs](../blob/master/src/find-specs.js) has identified the following candidates as potential new specs to consider:
[find-specs](../blob/main/src/find-specs.js) has identified the following candidates as potential new specs to consider:

{{ env.candidate_list }}

Please review if they match the inclusion criteria. Those that don't and never will should be added to [ignore.json](../blob/master/src/data/ignore.json), those that don't match yet but may in the future can be added to [monitor-repo.json](../blob/master/src/data/monitor-repos.json), and those that do match should be brought as a pull request on [specs.json](../blob/master/specs.json).
Please review if they match the inclusion criteria. Those that don't and never will should be added to [ignore.json](../blob/main/src/data/ignore.json), those that don't match yet but may in the future can be added to [monitor-repo.json](../blob/main/src/data/monitor-repos.json), and those that do match should be brought as a pull request on [specs.json](../blob/main/specs.json).
4 changes: 2 additions & 2 deletions .github/incorrect-base-url.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ title: Base URL mismatch
assignees: tidoust, dontcallmedom
labels: bug
---
[check-base-url](../blob/master/src/check-base-url.js) has detected that the base URL (i.e. the one that appears in the root `url` property in `index.json`) of the following specifications does not match the `release` URL or the `nightly` URL:
[check-base-url](../blob/main/src/check-base-url.js) has detected that the base URL (i.e. the one that appears in the root `url` property in `index.json`) of the following specifications does not match the `release` URL or the `nightly` URL:

{{ env.check_list }}

Please review the above list. For each specification, consider updating the URL in [specs.json](../blob/master/specs.json) or fixing the info at the source (the W3C API, Specref, or the spec itself). If the discrepancy seems warranted, the specification should be hardcoded as an exception to the rule in the [check-base-url](../blob/master/src/check-base-url.js) script.
Please review the above list. For each specification, consider updating the URL in [specs.json](../blob/main/specs.json) or fixing the info at the source (the W3C API, Specref, or the spec itself). If the discrepancy seems warranted, the specification should be hardcoded as an exception to the rule in the [check-base-url](../blob/main/src/check-base-url.js) script.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
- cron: '10 */6 * * *'
push:
branches:
- master
- main
name: Update spec info
jobs:
fetch:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
name: Test and lint
jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ Provided that you have the appropriate admin rights and that a `GITHUB_TOKEN`
environment variable is set to a [GitHub Personal
Token](https://github.com/settings/tokens) with `repo` rights, you may release a
new version through the following command, to be run from an up-to-date local
`master` branch:
`main` branch:

```bash
npm run release
Expand Down
2 changes: 1 addition & 1 deletion schema/data.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/schema#",
"$id": "https://github.com/w3c/browser-specs/tree/master/schema/data.json",
"$id": "https://w3c.github.io/browser-specs/schema/data.json",

"type": "object",
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion schema/definitions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/schema#",
"$id": "https://github.com/w3c/browser-specs/tree/master/schema/definitions.json",
"$id": "https://w3c.github.io/browser-specs/schema/definitions.json",

"proptype": {
"url": {
Expand Down
2 changes: 1 addition & 1 deletion schema/index.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/schema#",
"$id": "https://github.com/w3c/browser-specs/tree/master/schema/index.json",
"$id": "https://w3c.github.io/browser-specs/schema/index.json",

"type": "array",
"items": {
Expand Down
2 changes: 1 addition & 1 deletion schema/specs.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/schema#",
"$id": "https://github.com/w3c/browser-specs/tree/master/schema/specs.json",
"$id": "https://w3c.github.io/browser-specs/schema/specs.json",

"type": "array",
"items": {
Expand Down

0 comments on commit 02e1349

Please sign in to comment.