From c8d6e02b37e86839364656e53d93434aa8bc14e9 Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)" <carol.nichols@gmail.com>
Date: Wed, 3 Sep 2025 13:34:42 -0400
Subject: [PATCH] Change branch name from master to main

Connects to #1687.
---
 .github/workflows/main.yml           | 6 +++---
 .github/workflows/snapshot_tests.yml | 4 ++--
 README.md                            | 2 +-
 templates/footer.html                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a5a91610e..ce043ce82 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 env:
@@ -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:
@@ -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]
 
diff --git a/.github/workflows/snapshot_tests.yml b/.github/workflows/snapshot_tests.yml
index ee9308f4b..b42ebe966 100644
--- a/.github/workflows/snapshot_tests.yml
+++ b/.github/workflows/snapshot_tests.yml
@@ -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
diff --git a/README.md b/README.md
index 7dc0c8281..afa8b7479 100644
--- a/README.md
+++ b/README.md
@@ -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
   ```
diff --git a/templates/footer.html b/templates/footer.html
index 7dbeda7fb..9b655f7ed 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -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>