Skip to content
Open
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:

env:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:

pub_date:
name: Check publication date for placeholder
if: ${{ github.ref == 'refs/heads/master' }}
if: ${{ github.ref == 'refs/heads/main' }}

runs-on: ubuntu-latest
steps:
Expand All @@ -56,7 +56,7 @@ jobs:
- run: cargo test -p front_matter -- --include-ignored date_is_set

deploy:
if: ${{ github.ref == 'refs/heads/master' }}
if: ${{ github.ref == 'refs/heads/main' }}

needs: [pub_date, build]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snapshot_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
run: cargo install --locked --git https://github.com/getzola/zola --rev 45d3f8d6285f0b47013c5fa31eb405332118af8b

- run: git fetch --depth 2
- run: git checkout origin/master
- run: git checkout origin/main
- name: Generate good snapshots
run: INSTA_OUTPUT=none INSTA_UPDATE=always cargo test -p snapshot -- --include-ignored
- run: git checkout $GITHUB_SHA # merge of master+branch
- run: git checkout $GITHUB_SHA # merge of main+branch
- run: INSTA_OUTPUT=none INSTA_UPDATE=no cargo test -p snapshot -- --include-ignored
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ You can also run these tests locally for a faster feedback cycle:

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

- Generate the good snapshots to compare against, usually based off the master branch:
- Generate the good snapshots to compare against, usually based off the main branch:
```sh
cargo insta test -p snapshot --accept --include-ignored
```
Expand Down
2 changes: 1 addition & 1 deletion templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h4 class="mt4 mb3">RSS</h4>
</div>
<div class="attribution">
Maintained by the Rust Team. See a typo?
<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>!
<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>!
</div>
</div>
</footer>
Expand Down