Bump version to v1.21.0b2

This reverts commit 12df7591ae.

.github/workflows/lint.yml

@@ -1,12 +1,22 @@
 name: Lint
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 jobs:
   build:
     name: Add-on configuration
     runs-on: ubuntu-latest
     strategy:
-       matrix:
+      matrix:
-         channel: [esphome, esphome-beta, esphome-dev]
+        channels:
+          - folder: esphome
+            channel: stable
+          - folder: esphome-beta
+            channel: beta
+          - folder: esphome-dev
+            channel: dev
     steps:
       - name: ⤵️ Check out code from GitHub
         uses: actions/checkout@v2
@@ -17,8 +27,8 @@ jobs:
       - name: 🛠 Install dependencies
         run: pip install -r script/requirements.txt
       - name: 🛠 Generate files from template
-        run: python script/generate.py dev beta stable
+        run: python script/generate.py ${{ matrix.channels.channel }}
-      - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channel }}
+      - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channels.channel }}
         uses: frenck/action-addon-linter@v2
         with:
-          path: "./${{ matrix.channel }}"
+          path: "./${{ matrix.channels.folder }}"

esphome-beta/config.json

@@ -25,7 +25,6 @@
   },
   "schema": {
     "certfile": "str?",
-    "esphome_version": "str?",
     "keyfile": "str?",
     "leave_front_door_open": "bool?",
     "relative_url": "str?",
@@ -40,5 +39,5 @@
   "stage": "experimental",
   "uart": true,
   "url": "https://beta.esphome.io/",
-  "version": "1.20.0b2"
+  "version": "1.21.0b2"
 }

esphome-dev/config.json

@@ -5,7 +5,7 @@
     "aarch64"
   ],
   "auth_api": true,
-  "description": "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files",
+  "description": "Development version of ESPHome add-on",
   "hassio_api": true,
   "host_network": true,
   "ingress": true,
@@ -15,19 +15,15 @@
     "config:rw"
   ],
   "name": "ESPHome (dev)",
-  "options": {
-    "esphome_version": "dev"
-  },
   "panel_icon": "mdi:chip",
   "ports": {
     "6052/tcp": null
   },
   "ports_description": {
-    "6052/tcp": "Web interface (Not required for Home Assistant Ingress)"
+    "6052/tcp": "Web interface (not required for Home Assistant ingress)"
   },
   "schema": {
     "certfile": "str?",
-    "esphome_version": "str?",
     "keyfile": "str?",
     "leave_front_door_open": "bool?",
     "relative_url": "str?",

esphome/config.json

@@ -39,5 +39,5 @@
   ],
   "uart": true,
   "url": "https://esphome.io/",
-  "version": "1.19.4"
+  "version": "1.20.4"
 }

template/addon_config.yaml

@@ -1,6 +1,6 @@
 ---
 # When changing options in this file, please also run:
-#    python3 script/generate.py dev 
+#    python3 script/generate.py dev
 # to update the dev addon config (beta/stable configs will be updated on next release by release script)
 base: &base
   url: https://esphome.io/
@@ -31,7 +31,6 @@ base: &base
     certfile: str?
     keyfile: str?
     leave_front_door_open: bool?
-    esphome_version: str?
     streamer_mode: bool?
     relative_url: str?
     status_use_ping: bool?
@@ -48,14 +47,12 @@ esphome-dev:
   description: "Development version of ESPHome add-on"
   url: https://next.esphome.io/
   stage: experimental
-  options:
-    esphome_version: dev
 
 esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: '1.20.0b2'  # BETA
+  version: '1.21.0b2'  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
@@ -66,7 +63,7 @@ esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '1.19.4'  # STABLE
+  version: '1.20.4'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: esphome/esphome-hassio-{arch}