Skip to content

Commit b45c51c

Browse files
committed
update/correct default branch names
1 parent f99da10 commit b45c51c

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

.github/workflows/lektor-build-deploy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ jobs:
44
build-and-deploy:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v1
7+
- uses: actions/checkout@v2
88
- name: setup python version
9-
uses: actions/setup-python@v1
9+
uses: actions/setup-python@v3
1010
with:
1111
python-version: 3.9
1212
- name: Install dependencies
@@ -15,6 +15,6 @@ jobs:
1515
pipenv sync
1616
pipenv run lektor build -f webpack
1717
- name: Deploy to production
18-
if: github.ref == 'refs/heads/master'
18+
if: github.ref == 'refs/heads/main'
1919
run: |
2020
pipenv run lektor deploy ghpages --username ${{ secrets.LEKTOR_DEPLOY_USERNAME }} --password ${{ secrets.LEKTOR_DEPLOY_PASSWORD }}

CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
The Creative Commons team is committed to fostering a welcoming community. This project and all other Creative Commons open source projects are governed by our [Code of Conduct](https://creativecommons.github.io/community/code-of-conduct/). Please report unacceptable behavior to [conduct@creativecommons.org](mailto:conduct@creativecommons.org) per our [reporting guidelines](https://creativecommons.github.io/community/code-of-conduct/enforcement/).
44

5-
For a history of updates, see the [page history here](https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr).
5+
For a history of updates, see the [page history here](https://github.com/creativecommons/creativecommons.github.io-source/commits/main/content/community/code-of-conduct/contents.lr).

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ else fails, try removing the virtual environment and reinstalling:
152152
153153
## Deployment
154154
155-
We have continuous deployment set up. To deploy, push your code to the `master`
156-
branch (or make a pull request against the `master` branch. GitHub Actions
157-
builds and deploys the site whenever it detects new commits on the `master`
155+
We have continuous deployment set up. To deploy, push your code to the `main`
156+
branch (or make a pull request against the `main` branch. GitHub Actions
157+
builds and deploys the site whenever it detects new commits on the `main`
158158
branch.
159159
160160
The GitHub Actions configuration is located at

assets/CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ For a history of updates, see the [page history here][updates].
1010

1111
[code_of_conduct]:https://creativecommons.github.io/community/code-of-conduct/
1212
[reporting_guide]:https://creativecommons.github.io/community/code-of-conduct/enforcement/
13-
[updates]:https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr
13+
[updates]:https://github.com/creativecommons/vocabulary/commits/main/content/community/code-of-conduct/contents.lr

content/blog/entries/cc-vocabulary-docs-updates-closing/contents.lr

+3-3
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ Here's the link to the [documentation site](https://cc-vocabulary.netlify.app).
234234
</tr>
235235
<tr>
236236
<td>Added a CHANGELOG.md to adhere to OSS conventions</td>
237-
<td><a href=https://github.com/creativecommons/vocabulary/pull/671">https://github.com/creativecommons/vocabulary/pull/671</a><br><a href="https://github.com/creativecommons/vocabulary/blob/master/CHANGELOG.md">https://github.com/creativecommons/vocabulary/blob/master/CHANGELOG.md</a></td>
237+
<td><a href=https://github.com/creativecommons/vocabulary/pull/671">https://github.com/creativecommons/vocabulary/pull/671</a><br><a href="https://github.com/creativecommons/vocabulary/blob/main/CHANGELOG.md">https://github.com/creativecommons/vocabulary/blob/main/CHANGELOG.md</a></td>
238238
</tr>
239239
<tr>
240240
<td>Unified README.md and updated monorepo build process</td>
@@ -254,11 +254,11 @@ Here's the link to the [documentation site](https://cc-vocabulary.netlify.app).
254254
</tr>
255255
<tr>
256256
<td>Add a maintained with Lerna badge</td>
257-
<td><a href="https://github.com/creativecommons/vocabulary/issues/807">https://github.com/creativecommons/vocabulary/issues/807</a><br><a href="https://github.com/creativecommons/vocabulary/blob/master/README.md">https://github.com/creativecommons/vocabulary/blob/master/README.md</a></td>
257+
<td><a href="https://github.com/creativecommons/vocabulary/issues/807">https://github.com/creativecommons/vocabulary/issues/807</a><br><a href="https://github.com/creativecommons/vocabulary/blob/main/README.md">https://github.com/creativecommons/vocabulary/blob/main/README.md</a></td>
258258
</tr>
259259
<tr>
260260
<td>Add new install size badges for our packages</td>
261-
<td><a href="https://github.com/creativecommons/vocabulary/issues/776">https://github.com/creativecommons/vocabulary/issues/776</a><br><a href="https://github.com/creativecommons/vocabulary/blob/master/README.md">https://github.com/creativecommons/vocabulary/blob/master/README.md</a</td>
261+
<td><a href="https://github.com/creativecommons/vocabulary/issues/776">https://github.com/creativecommons/vocabulary/issues/776</a><br><a href="https://github.com/creativecommons/vocabulary/blob/main/README.md">https://github.com/creativecommons/vocabulary/blob/main/README.md</a</td>
262262
</tr>
263263
<tr>
264264
<td>Customise individual README's for our packages</td>

content/blog/entries/saltstack-host-classification/contents.lr

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ still room for improvement. For example, I will probably refactor `HST` to
8484
The [creativecommons/sre-salt-prime][sre-salt-prime-repo] repository is open
8585
source.
8686

87-
This host classification is also documented within it: [sre-salt-prime/Host_Classification.md at master][host-class].
87+
This host classification is also documented within it: [sre-salt-prime/Host_Classification.md at main][host-class].
8888

8989

9090
[FAQ21]: https://docs.saltstack.com/en/latest/faq.html#is-targeting-using-grain-data-secure
9191
[sre-salt-prime-repo]:https://github.com/creativecommons/sre-salt-prime
92-
[host-class]: https://github.com/creativecommons/sre-salt-prime/blob/master/docs/Host_Classification.md
92+
[host-class]: https://github.com/creativecommons/sre-salt-prime/blob/main/docs/Host_Classification.md

content/community/code-of-conduct/enforcement/contents.lr

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ comply with the current policy.
181181
content/community/code-of-conduct/enforcement/contents.lr -
182182
creativecommons/creativecommons.github.io-source][commits].
183183

184-
[commits]: https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/enforcement/contents.lr
184+
[commits]: https://github.com/creativecommons/vocabulary/commits/main/content/community/code-of-conduct/enforcement/contents.lr
185185

186186
## Attribution
187187

content/community/write-a-blog-post/contents.lr

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If you're writing about a project you're working on, here are a few ways you cou
2929
- Announce your project and ask for contributions (example: [CC Vocabulary announcement](https://creativecommons.github.io/blog/entries/cc-vocabulary-new-design-system/))
3030
- Write an overview of how your project works without as much narrative (example: [this post about the CC Catalog](https://creativecommons.github.io/blog/entries/cc-catalog-leverage-open-data-1/))
3131

32-
<p class="text-muted"><em>If you have more tips, <a href="https://github.com/creativecommons/creativecommons.github.io-source/blob/master/content/community/write-a-blog-post/contents.lr">submit an edit to this page</a>.</em></p>
32+
<p class="text-muted"><em>If you have more tips, <a href="https://github.com/creativecommons/vocabulary/blob/main/content/community/write-a-blog-post/contents.lr">submit an edit to this page</a>.</em></p>
3333

3434
## How to post
3535

content/contributing-code/github-repo-guidelines/contents.lr

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ All GitHub repositories should have the following items to be considered fully r
1616
- [About code owners - GitHub Help](https://help.github.com/en/articles/about-code-owners)
1717
- `/.cc-metadata.yml`: The standard [CC metadata YAML file](#cc-metadata-file).
1818
- `/CODE_OF_CONDUCT.md`: Code of Conduct
19-
- Feel free to use our standard [`CODE_OF_CONDUCT.md`](https://github.com/creativecommons/.github/blob/master/CODE_OF_CONDUCT.md) file from [creativecommons/.github](https://github.com/creativecommons/.github)
19+
- Feel free to use our standard [`CODE_OF_CONDUCT.md`](https://github.com/creativecommons/vocabulary/blob/main/CODE_OF_CONDUCT.md) file from [creativecommons/.github](https://github.com/creativecommons/.github)
2020
- [Adding a code of conduct to your project - GitHub Help](https://help.github.com/en/articles/adding-a-code-of-conduct-to-your-project)
2121
- `/LICENSE`: license file.
2222
- `/CONTRIBUTING.md`: contributor guidelines
23-
- Can be project-specific or our standard [`CONTRIBUTING.md`](https://github.com/creativecommons/.github/blob/master/CONTRIBUTING.md) file from [creativecommons/.github](https://github.com/creativecommons/.github)
23+
- Can be project-specific or our standard [`CONTRIBUTING.md`](https://github.com/creativecommons/vocabulary/blob/main/CONTRIBUTING.md) file from [creativecommons/.github](https://github.com/creativecommons/.github)
2424
- [Setting guidelines for repository contributors - GitHub Help](https://help.github.com/en/articles/setting-guidelines-for-repository-contributors)
2525
- `/README.md`: read me information file
2626
- Must documents how to install and build the project locally and documents a high level overview of the project and code structure. It should also link to any other available documentation.

databags/repos.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@
476476
"language": "HTML",
477477
"license": {
478478
"name": "MIT License",
479-
"url": "https://github.com/creativecommons/creativecommons.github.io-source/blob/master/LICENSE"
479+
"url": "https://github.com/creativecommons/creativecommons.github.io-source/blob/main/LICENSE"
480480
},
481481
"name": "creativecommons.github.io-source",
482482
"slack": "",
@@ -1250,4 +1250,4 @@
12501250
"website": null
12511251
}
12521252
]
1253-
}
1253+
}

webpack/js/components.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export const App = {
240240
}
241241
},
242242
mounted() {
243-
const BASE_URL = 'https://raw.githubusercontent.com/creativecommons/ccos-scripts/master/normalize_repos'
243+
const BASE_URL = 'https://raw.githubusercontent.com/creativecommons/ccos-scripts/main/normalize_repos'
244244
const FILE_URL = name => `${BASE_URL}/${name}.yml`
245245

246246
this.octokit = new Octokit()

0 commit comments

Comments
 (0)