Skip to content

Commit 92ca87d

Browse files
authored
Merge pull request #1689 from integer32llc/default-branch
Change branch name from master to main
2 parents 45f5d1c + c8d6e02 commit 92ca87d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
pull_request:
77

88
env:
@@ -44,7 +44,7 @@ jobs:
4444

4545
pub_date:
4646
name: Check publication date for placeholder
47-
if: ${{ github.ref == 'refs/heads/master' }}
47+
if: ${{ github.ref == 'refs/heads/main' }}
4848

4949
runs-on: ubuntu-latest
5050
steps:
@@ -56,7 +56,7 @@ jobs:
5656
- run: cargo test -p front_matter -- --include-ignored date_is_set
5757

5858
deploy:
59-
if: ${{ github.ref == 'refs/heads/master' }}
59+
if: ${{ github.ref == 'refs/heads/main' }}
6060

6161
needs: [pub_date, build]
6262

.github/workflows/snapshot_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
run: cargo install --locked --git https://github.com/getzola/zola --rev 45d3f8d6285f0b47013c5fa31eb405332118af8b
1919

2020
- run: git fetch --depth 2
21-
- run: git checkout origin/master
21+
- run: git checkout origin/main
2222
- name: Generate good snapshots
2323
run: INSTA_OUTPUT=none INSTA_UPDATE=always cargo test -p snapshot -- --include-ignored
24-
- run: git checkout $GITHUB_SHA # merge of master+branch
24+
- run: git checkout $GITHUB_SHA # merge of main+branch
2525
- run: INSTA_OUTPUT=none INSTA_UPDATE=no cargo test -p snapshot -- --include-ignored

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ You can also run these tests locally for a faster feedback cycle:
5757

5858
- Make sure you have [cargo-insta](https://insta.rs/docs/quickstart/) installed.
5959

60-
- Generate the good snapshots to compare against, usually based off the master branch:
60+
- Generate the good snapshots to compare against, usually based off the main branch:
6161
```sh
6262
cargo insta test -p snapshot --accept --include-ignored
6363
```

templates/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h4 class="mt4 mb3">RSS</h4>
3838
</div>
3939
<div class="attribution">
4040
Maintained by the Rust Team. See a typo?
41-
<a href="https://github.com/rust-lang/blog.rust-lang.org{% if page %}/edit/master/content/{{ page.relative_path }}{% endif %}" target="_blank" rel="noopener">Send a fix here</a>!
41+
<a href="https://github.com/rust-lang/blog.rust-lang.org{% if page %}/edit/main/content/{{ page.relative_path }}{% endif %}" target="_blank" rel="noopener">Send a fix here</a>!
4242
</div>
4343
</div>
4444
</footer>

0 commit comments

Comments
 (0)