From b4cc355a1d810260da3e2c3a6fc38386c6dcbed5 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Tue, 16 Feb 2021 11:46:40 -0500 Subject: [PATCH 1/2] default branch is 'main' now --- README.md | 2 +- client/public/contribute.json | 2 +- docs/REVIEWING.md | 4 ++-- docs/deployments.md | 2 +- docs/npm-releases.md | 6 +++--- kumascript/macros/TemplateLink.ejs | 2 +- kumascript/tests/macros/TemplateLink.test.js | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 14f388ab5b98..da5a12dcd1c8 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/client/public/contribute.json b/client/public/contribute.json index cc9c380d3a69..c281759ebff6 100644 --- a/client/public/contribute.json +++ b/client/public/contribute.json @@ -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" diff --git a/docs/REVIEWING.md b/docs/REVIEWING.md index dce66d6f0031..0d7f0969209a 100644 --- a/docs/REVIEWING.md +++ b/docs/REVIEWING.md @@ -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 @@ -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. diff --git a/docs/deployments.md b/docs/deployments.md index 4564e30a9dc7..0013e4aeb9d0 100644 --- a/docs/deployments.md +++ b/docs/deployments.md @@ -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?" diff --git a/docs/npm-releases.md b/docs/npm-releases.md index 0ee705507baf..070154ca3495 100644 --- a/docs/npm-releases.md +++ b/docs/npm-releases.md @@ -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). @@ -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 diff --git a/kumascript/macros/TemplateLink.ejs b/kumascript/macros/TemplateLink.ejs index cd4603ce7ecb..9b36fdb8ab90 100644 --- a/kumascript/macros/TemplateLink.ejs +++ b/kumascript/macros/TemplateLink.ejs @@ -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; %> <%=text%> diff --git a/kumascript/tests/macros/TemplateLink.test.js b/kumascript/tests/macros/TemplateLink.test.js index b6ae741ac09e..6881afba8cc8 100644 --- a/kumascript/tests/macros/TemplateLink.test.js +++ b/kumascript/tests/macros/TemplateLink.test.js @@ -8,7 +8,7 @@ describeMacro("TemplateLink", () => { return assert.eventually.equal( macro.call("TemplateLink"), '' + - '' + + '' + "TemplateLink" + "" ); From d1a38b6740e7d61626afe47395f712b76199984f Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Tue, 16 Feb 2021 12:18:30 -0500 Subject: [PATCH 2/2] more places --- .github/workflows/auto-merge.yml | 2 +- .github/workflows/npm-publish.yml | 2 +- .github/workflows/testing.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 4fabbcf5c511..c3e90bc18ad8 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -3,7 +3,7 @@ name: auto-merge on: pull_request: branches: - - master + - main jobs: auto-merge: diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 87113d8739a2..daaed940d367 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -3,7 +3,7 @@ name: NPM Publish on: push: branches: - - master + - main jobs: build: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1ecf61f4aacd..2fa236187c00 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -6,7 +6,7 @@ name: Testing Yari on: push: branches: - - master + - main pull_request: jobs: