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 is 'main' now #2953

Merged
merged 2 commits into from
Feb 16, 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 .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: auto-merge
on:
pull_request:
branches:
- master
- main

jobs:
auto-merge:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: NPM Publish
on:
push:
branches:
- master
- main

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Testing Yari
on:
push:
branches:
- master
- main
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ review Yari changes.
Periodically, the code and the content changes. Make sure you're staying
up-to-date with these commands:

git pull origin master
git pull origin main
yarn
yarn dev

Expand Down
2 changes: 1 addition & 1 deletion client/public/contribute.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"participate": {
"home": "https://wiki.mozilla.org/MDN",
"docs": "https://github.com/mdn/yari/blob/master/README.md",
"docs": "https://github.com/mdn/yari/blob/main/README.md",
"mailing-list": "https://discourse.mozilla.org/c/mdn",
"chat": {
"url": "https://chat.mozilla.org/#/room/#mdn:mozilla.org"
Expand Down
4 changes: 2 additions & 2 deletions docs/REVIEWING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ When you are tasked with reviewing a Yari pull request:

The legacy [KumaScript](https://developer.mozilla.org/en-US/docs/MDN/Tools/KumaScript)
macro system is available inside the yari repo in the
[kumascript](https://github.com/mdn/yari/tree/master/kumascript) subdirectory.
[kumascript](https://github.com/mdn/yari/tree/main/kumascript) subdirectory.

Testing changes to KumaScript macros — whether you are making your own change or
reviewing someone
Expand All @@ -58,6 +58,6 @@ as described above, you can load up an MDN page that contains the appropriate
macro call and see if it works.

If you need to update a macro, you can make a change to the relevant `.ejs` file
(see the [macros](https://github.com/mdn/yari/tree/master/kumascript/macros) subdirectory),
(see the [macros](https://github.com/mdn/yari/tree/main/kumascript/macros) subdirectory),
save it, and reload the page in your browser to see the change in action
immediately.
2 changes: 1 addition & 1 deletion docs/deployments.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Kuma to render what can't be rendered as a static asset.

## Tracking Whatsdeployed

These URLs give you a comparison between what's the `master` (for Yari)
These URLs give you a comparison between what's the `main` (for Yari)
and `main` (for Content) in the git repo, compared to what's made it into
each deployment environment. This helps to answer "Has my change gone live yet?"

Expand Down
6 changes: 3 additions & 3 deletions docs/npm-releases.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NPM Releases

In essence, every commit to master triggers a new build which gets
In essence, every commit to `main` triggers a new build which gets
published on [npmjs.com as
`@mdn/yari`](https://www.npmjs.com/package/@mdn/yari).

Expand Down Expand Up @@ -29,9 +29,9 @@ First of all, the version numbers don't matter. We're basically using NPM
releases instead of relying on `git submodule` because tools like
`yarn` is easier to use.

For every commit to `master` our GitHub Action for NPM publishing will
For every commit to `main` our GitHub Action for NPM publishing will
make a patch release. I.e. from `0.9.1` to `0.9.2`. This will happen no
matter how trivial the `master` commit changeset is.
matter how trivial the `main` commit changeset is.

If you want to trigger a release with minor increment (i.e. from `0.9.2`
to `0.10.0`) you make a commit with a message that contains the
Expand Down
2 changes: 1 addition & 1 deletion kumascript/macros/TemplateLink.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* $0 - Name of the template to link to.
*/

let dest = "https://github.com/mdn/yari/tree/master/kumascript/macros/" + $0 + ".ejs";
let dest = "https://github.com/mdn/yari/tree/main/kumascript/macros/" + $0 + ".ejs";
let text = $0;
%>
<code class="templateLink"><a href="<%-dest%>"><%=text%></a></code>
2 changes: 1 addition & 1 deletion kumascript/tests/macros/TemplateLink.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describeMacro("TemplateLink", () => {
return assert.eventually.equal(
macro.call("TemplateLink"),
'<code class="templateLink">' +
'<a href="https://github.com/mdn/yari/tree/master/kumascript/macros/TemplateLink.ejs">' +
'<a href="https://github.com/mdn/yari/tree/main/kumascript/macros/TemplateLink.ejs">' +
"TemplateLink" +
"</a></code>"
);
Expand Down