From d5278351da993ad24f9e7523a0d69f75457ea0dd Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 2 Jul 2021 15:42:36 +0200
Subject: [PATCH] Rename master branch to release (#1976)

---
 .github/workflows/ci-docker.yml | 2 +-
 .github/workflows/ci.yml        | 2 +-
 .github/workflows/release.yml   | 2 +-
 .pre-commit-config.yaml         | 2 +-
 README.md                       | 2 +-
 esphome/core/config.py          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index b5f8b7b0e0..91ec88aeb3 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -3,7 +3,7 @@ name: CI for docker images
 # Only run when docker paths change
 on:
   push:
-    branches: [dev, beta, master]
+    branches: [dev, beta, release]
     paths:
       - 'docker/**'
       - '.github/workflows/**'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a27cbe67b0..121b3f1339 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
   push:
     # On dev branch release-dev already performs CI checks
     # On other branches the `pull_request` trigger will be used
-    branches: [beta, master]
+    branches: [beta, release]
 
   pull_request:
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9523a2164c..383f2878e5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -307,4 +307,4 @@ jobs:
             -X POST \
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/esphome/hassio/actions/workflows/bump-version.yml/dispatches \
-            -d "{\"ref\":\"master\",\"inputs\":{\"version\":\"$TAG\"}}"
+            -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1e56aa17cf..a821c21fa7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,5 +23,5 @@ repos:
       - id: no-commit-to-branch
         args:
           - --branch=dev
-          - --branch=master
+          - --branch=release
           - --branch=beta
diff --git a/README.md b/README.md
index f21e748d40..bb6fb37d3a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ESPHome [![Build Status](https://travis-ci.org/esphome/esphome.svg?branch=master)](https://travis-ci.org/esphome/esphome) [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
+# ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
 
 [![ESPHome Logo](https://esphome.io/_images/logo-text.png)](https://esphome.io/)
 
diff --git a/esphome/core/config.py b/esphome/core/config.py
index fd4b7088cc..f55acc1892 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -77,7 +77,7 @@ PLATFORMIO_ESP8266_LUT = {
     #    recommended version as otherwise a bunch of devices could be bricked
     #  * The docker images need to be updated to ship the new recommended version, in order not
     #    to DDoS platformio servers.
-    #    Update this file: https://github.com/esphome/esphome-docker-base/blob/master/platformio.ini
+    #    Update this file: https://github.com/esphome/esphome-docker-base/blob/main/platformio.ini
     "RECOMMENDED": ARDUINO_VERSION_ESP8266["2.7.4"],
     "LATEST": "espressif8266",
     "DEV": ARDUINO_VERSION_ESP8266["dev"],