Update publish workflow to use main branch (linkerd#1043)

* Update publish workflow to use main branch * Update references to main branch for this repo Signed-off-by: Charles Pretzer <[email protected]>
chetanpdeshmukh · Apr 15, 2021 · 002c26a · 002c26a
1 parent 1318e79
commit 002c26a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: publish
 on:
   push:
     branches:
-    - master
+    - main
   repository_dispatch:
     types: [release]
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -35,7 +35,7 @@ Do you have an improvement?
 2. We will try to respond to your issue promptly.
 3. Fork this repo, develop and test your code changes. See the project's
   [README](README.md) for further information about working in this repository.
-4. Submit a pull request against this repo's `master` branch.
+4. Submit a pull request against this repo's `main` branch.
 5. Your branch may be merged once all configured checks pass, including:
 
     - 2 code review approvals, at least 1 of which is from a
@@ -45,7 +45,7 @@ Do you have an improvement?
 ## Committing ##
 
 We prefer squash or rebase commits so that all changes from a branch are
-committed to master as a single commit. All pull requests are squashed when
+committed to main as a single commit. All pull requests are squashed when
 merged, but rebasing prior to merge gives you better control over the commit
 message.
 

diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ released separately.
 ### Updating docs from Linkerd
 
 See [slate documentation](slate-linkerd) `./build` will grab whatever's on
-master from slate-linkerd and add it to the public dir.
+main from slate-linkerd and add it to the public dir.
 
 ### Creating a new release
 

diff --git a/linkerd.io/layouts/partials/footer.html b/linkerd.io/layouts/partials/footer.html
@@ -42,7 +42,7 @@
   <div class="is-paddingless has-background-navy-black">
     <div class="container columns footer has-background-navy-black">
       <p class="column is-narrow">
-        <a href="https://github.com/linkerd/website/tree/master/linkerd.io/content" class="">Edit This Site</a>
+        <a href="https://github.com/linkerd/website/tree/main/linkerd.io/content" class="">Edit This Site</a>
       </p>
       <p class="column has-text-white">© {{ now.Year }} Linkerd Authors. All rights reserved.</p>
     </div>

diff --git a/linkerd.io/layouts/partials/footer_old.html b/linkerd.io/layouts/partials/footer_old.html
@@ -1,12 +1,12 @@
 {{ $isHome   := .IsHome }}
 {{ $filepath := .File.Path }}
-{{ $editUrl  := printf "https://github.com/linkerd/website/edit/master/linkerd.io/content/%s" $filepath }}
+{{ $editUrl  := printf "https://github.com/linkerd/website/edit/main/linkerd.io/content/%s" $filepath }}
 <div class="border-top">
   <footer class="container">
     <div class="row my-5">
       <div class="col-md-6 pb-3">
         {{ if $isHome }}
-        <a class="btn btn-dark" href="https://github.com/linkerd/website/tree/master/linkerd.io/content">
+        <a class="btn btn-dark" href="https://github.com/linkerd/website/tree/main/linkerd.io/content">
           <i class="fab fa-github"></i>&nbsp;Edit this site
         </a>
         {{ else }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: publish @@
     on:
       push:
         branches:
-        - master
+        - main
       repository_dispatch:
         types: [release]
@@ Expand Down @@