Merge branch 'main' into basic-grcp-server-smoke-test

tinkerbell · Sep 9, 2021 · 439daa8 · 439daa8
2 parents fe4d644 + 42e5ad1
commit 439daa8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -121,7 +121,7 @@ jobs:
       uses: actions/checkout@v2
     - name: Login to quay.io
       uses: docker/login-action@v1
-      if: ${{ startsWith(github.ref, 'refs/heads/master') }}
+      if: ${{ startsWith(github.ref, 'refs/heads/main') }}
       with:
         registry: quay.io
         username: ${{ secrets.QUAY_USERNAME }}
@@ -142,6 +142,6 @@ jobs:
       with:
         context: cmd/${{ matrix.binary }}/
         cache-from: type=registry,ref=${{ matrix.repository }}:latest
-        push: ${{ startsWith(github.ref, 'refs/heads/master') }}
+        push: ${{ startsWith(github.ref, 'refs/heads/main') }}
         tags: ${{ steps.docker-image-tag.outputs.tags }}
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,7 +1,7 @@
 pull_request_rules:
   - name: Automatic merge on approval
     conditions:
-      - base=master
+      - base=main
       - "#approved-reviews-by>=1"
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Thanks for helping make Tinkerbell better 😍!
 
 There are many areas we can use contributions - ranging from code, documentation, feature proposals, issue triage, samples, and content creation.
 
-First, please read and understand the code of conduct found [here](https://github.com/tinkerbell/.github/blob/master/CODE_OF_CONDUCT.md).
+First, please read and understand the code of conduct found [here](https://github.com/tinkerbell/.github/blob/main/CODE_OF_CONDUCT.md).
 By participating, you're expected to uphold this code.
 
 ## Table of Contents

diff --git a/OWNERS.md b/OWNERS.md
@@ -1,3 +1,3 @@
 #OWNERS
 
-Please see [https://github.com/tinkerbell/.github/blob/master/OWNERS.md](https://github.com/tinkerbell/.github/blob/master/OWNERS.md).
+Please see [https://github.com/tinkerbell/.github/blob/main/OWNERS.md](https://github.com/tinkerbell/.github/blob/main/OWNERS.md).
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Tinkerbell
 
-[![Build Status](https://github.com/tinkerbell/tink/workflows/For%20each%20commit%20and%20PR/badge.svg)](https://github.com/tinkerbell/tink/actions?query=workflow%3A%22For+each+commit+and+PR%22+branch%3Amaster)
-[![codecov](https://codecov.io/gh/tinkerbell/tink/branch/master/graph/badge.svg)](https://codecov.io/gh/tinkerbell/tink)
+[![Build Status](https://github.com/tinkerbell/tink/workflows/For%20each%20commit%20and%20PR/badge.svg)](https://github.com/tinkerbell/tink/actions?query=workflow%3A%22For+each+commit+and+PR%22+branch%3Amain)
+[![codecov](https://codecov.io/gh/tinkerbell/tink/branch/main/graph/badge.svg)](https://codecov.io/gh/tinkerbell/tink)
 ![](https://img.shields.io/badge/Stability-Experimental-red.svg)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4512/badge)](https://bestpractices.coreinfrastructure.org/projects/4512)
 
-This repository is [Experimental](https://github.com/packethost/standards/blob/master/experimental-statement.md) meaning that it's based on untested ideas or techniques and not yet established or finalized or involves a radically new and innovative style! This means that support is best effort (at best!) and we strongly encourage you to NOT use this in production.
+This repository is [Experimental](https://github.com/packethost/standards/blob/main/experimental-statement.md) meaning that it's based on untested ideas or techniques and not yet established or finalized or involves a radically new and innovative style! This means that support is best effort (at best!) and we strongly encourage you to NOT use this in production.
 
 ## License