Skip to content

Commit 979015c

Browse files
Switch remaining master references to main
1 parent 6cfc3a1 commit 979015c

File tree

6 files changed

+21
-25
lines changed

6 files changed

+21
-25
lines changed

.github/workflows/ci-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
runs-on: ubuntu-latest
128128
timeout-minutes: 7
129129
# Only run on pushes to the default branch
130-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
130+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
131131
steps:
132132
- name: Check out a copy of the repo
133133
uses: actions/checkout@v4

tests/acceptance/sandbox/api/components-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module('Acceptance | Sandbox | API | components', function (hooks) {
3737

3838
assert.strictEqual(
3939
editThisPageLinkHref,
40-
'https://github.com/ember-learn/ember-cli-addon-docs/edit/master/tests/dummy/app/pods/sandbox/index/template.md',
40+
'https://github.com/ember-learn/ember-cli-addon-docs/edit/main/tests/dummy/app/pods/sandbox/index/template.md',
4141
);
4242
});
4343

@@ -61,7 +61,7 @@ module('Acceptance | Sandbox | API | components', function (hooks) {
6161

6262
assert.strictEqual(
6363
editThisPageLinkHref,
64-
'https://github.com/ember-learn/ember-cli-addon-docs/edit/master/packages/foo-bar/tests/dummy/app/pods/sandbox/index/template.md',
64+
'https://github.com/ember-learn/ember-cli-addon-docs/edit/main/packages/foo-bar/tests/dummy/app/pods/sandbox/index/template.md',
6565
);
6666
});
6767
});

tests/acceptance/version-selector-test.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ module('Acceptance | Version selector test', function (hooks) {
4949
path: '',
5050
name: 'Latest',
5151
},
52-
master: {
52+
main: {
5353
sha: '53b73465d31925f26fd1f77881aefcaccce2915a',
5454
tag: null,
55-
path: 'master',
56-
name: 'master',
55+
path: 'main',
56+
name: 'main',
5757
},
5858
'v0.2.x': {
5959
sha: 'aca26720d930843dd084b508fce75b158ff0386e',
@@ -90,7 +90,7 @@ module('Acceptance | Version selector test', function (hooks) {
9090

9191
assert
9292
.dom('[data-test-id="version"]:nth-child(2)')
93-
.includesText('master', 'master is rendered secon');
93+
.includesText('main', 'main is rendered second');
9494
assert.dom('[data-test-id="version"]:nth-child(2)').includesText('53b73');
9595

9696
assert
@@ -113,11 +113,11 @@ module('Acceptance | Version selector test', function (hooks) {
113113
path: '',
114114
name: 'Latest',
115115
},
116-
master: {
116+
main: {
117117
sha: '53b73465d31925f26fd1f77881aefcaccce2915a',
118118
tag: null,
119-
path: 'master',
120-
name: 'master',
119+
path: 'main',
120+
name: 'main',
121121
},
122122
'v0.1.0': {
123123
sha: 'd752437850bc9833ea3e354095b501473b0420ae',
@@ -145,7 +145,7 @@ module('Acceptance | Version selector test', function (hooks) {
145145
.includesText('Latest', 'latest is rendered on second open');
146146
assert
147147
.dom('[data-test-id="version"]:nth-child(2)')
148-
.includesText('master', 'master is rendered on second open');
148+
.includesText('main', 'main is rendered on second open');
149149
});
150150

151151
module('with a custom primary branch configured', function (hooks) {
@@ -167,11 +167,11 @@ module('Acceptance | Version selector test', function (hooks) {
167167
path: '',
168168
name: 'Latest',
169169
},
170-
master: {
170+
main: {
171171
sha: '53b73465d31925f26fd1f77881aefcaccce2915a',
172172
tag: null,
173-
path: 'master',
174-
name: 'master',
173+
path: 'main',
174+
name: 'main',
175175
},
176176
develop: {
177177
sha: '53b73465d31925f26fd1f77881aefcaccce2915a',
@@ -201,7 +201,7 @@ module('Acceptance | Version selector test', function (hooks) {
201201

202202
assert
203203
.dom('[data-test-id="version"]:nth-child(3)')
204-
.includesText('master', 'other branches are rendered last');
204+
.includesText('main', 'other branches are rendered last');
205205
assert.dom('[data-test-id="version"]:nth-child(3)').includesText('53b73');
206206
});
207207
});

tests/dummy/app/templates/docs/quickstart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ For both classic and native classes, install the [YUIDoc](http://yui.github.io/y
1616
ember install ember-cli-addon-docs-yuidoc
1717
```
1818

19-
You can see an example of <DocsLink @route="sandbox.api.item" @model="components/yuidoc-component">an autodocumented YUIDoc component</DocsLink> in the sandbox, and view its source [on GitHub](https://github.com/ember-learn/ember-cli-addon-docs/blob/master/sandbox/app/components/yuidoc-component.js).
19+
You can see an example of <DocsLink @route="sandbox.api.item" @model="components/yuidoc-component">an autodocumented YUIDoc component</DocsLink> in the sandbox, and view its source [on GitHub](https://github.com/ember-learn/ember-cli-addon-docs/blob/main/sandbox/app/components/yuidoc-component.js).
2020

2121
## 3. Add the docs routes
2222

@@ -133,7 +133,7 @@ Remember, the dummy site is a full Ember application and these components are ju
133133

134134
As you document the public objects in your addon, they'll automatically show up in the left-hand navigation of your `docs` route under the "API REFERENCE" section, assuming you added the `<DocsViewer/>` component.
135135

136-
Check out <DocsLink @route="sandbox">the sandbox</DocsLink> for an example addon with autogenerated API docs on the side. You can also take a look [at the code on GitHub](https://github.com/ember-learn/ember-cli-addon-docs/tree/master/sandbox) to see how these objects were documented.
136+
Check out <DocsLink @route="sandbox">the sandbox</DocsLink> for an example addon with autogenerated API docs on the side. You can also take a look [at the code on GitHub](https://github.com/ember-learn/ember-cli-addon-docs/tree/main/sandbox) to see how these objects were documented.
137137

138138
## 9. Add a 404 route
139139

tests/dummy/config/addon-docs.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@
33

44
const AddonDocsConfig = require('../../../lib/config');
55

6-
module.exports = class extends AddonDocsConfig {
7-
getPrimaryBranch() {
8-
return 'master';
9-
}
10-
};
6+
module.exports = class extends AddonDocsConfig {};

tests/dummy/mirage/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ export default function (config) {
1414
path: '',
1515
name: '-latest',
1616
},
17-
master: {
17+
main: {
1818
sha: '12345',
1919
tag: null,
20-
path: 'master',
21-
name: 'master',
20+
path: 'main',
21+
name: 'main',
2222
},
2323
};
2424
});

0 commit comments

Comments
 (0)