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/CHANGELOG.md

@@ -0,0 +1 @@
+See https://esphome.io/changelog/index.html

esphome-beta/README.md

@@ -1,6 +1,6 @@
 # ESPHome Home Assistant Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
 
 [![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
 [![GitHub Release][releases-shield]][releases]
@@ -14,7 +14,7 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.
 
 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
 </p>
 
 [View the ESPHome documentation](https://esphome.io/)
@@ -26,11 +26,11 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:
 
-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
 
 Then just click UPLOAD and the sensor will magically appear in Home Assistant:
 
-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
 
 [discord-shield]: https://img.shields.io/discord/429907082951524364.svg
 [dht22]: https://esphome.io/components/sensor/dht.html

esphome-beta/config.json

@@ -5,7 +5,7 @@
     "aarch64"
   ],
   "auth_api": true,
-  "description": "Beta version of ESPHome add-on.",
+  "description": "Beta version of ESPHome add-on",
   "hassio_api": true,
   "host_network": true,
   "image": "esphome/esphome-hassio-{arch}",
@@ -21,11 +21,10 @@
     "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?",
@@ -34,8 +33,11 @@
     "streamer_mode": "bool?"
   },
   "slug": "esphome-beta",
+  "snapshot_exclude": [
+    "*/*/"
+  ],
   "stage": "experimental",
   "uart": true,
   "url": "https://beta.esphome.io/",
-  "version": "1.19.0b2"
+  "version": "1.21.0b2"
 }

esphome-dev/README.md

@@ -1,6 +1,6 @@
 # ESPHome Home Assistant Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
 
 [![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
 [![GitHub Release][releases-shield]][releases]
@@ -14,7 +14,7 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.
 
 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
 </p>
 
 [View the ESPHome documentation](https://esphome.io/)
@@ -26,11 +26,11 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:
 
-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
 
 Then just click UPLOAD and the sensor will magically appear in Home Assistant:
 
-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
 
 [discord-shield]: https://img.shields.io/discord/429907082951524364.svg
 [dht22]: https://esphome.io/components/sensor/dht.html

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?",
@@ -36,6 +32,9 @@
     "streamer_mode": "bool?"
   },
   "slug": "esphome-dev",
+  "snapshot_exclude": [
+    "*/*/"
+  ],
   "stage": "experimental",
   "uart": true,
   "url": "https://next.esphome.io/",

esphome/CHANGELOG.md

@@ -0,0 +1 @@
+See https://esphome.io/changelog/index.html

esphome/README.md

@@ -1,6 +1,6 @@
 # ESPHome Home Assistant Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
 
 [![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
 [![GitHub Release][releases-shield]][releases]
@@ -14,7 +14,7 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.
 
 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
 </p>
 
 [View the ESPHome documentation](https://esphome.io/)
@@ -26,11 +26,11 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:
 
-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
 
 Then just click UPLOAD and the sensor will magically appear in Home Assistant:
 
-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
 
 [discord-shield]: https://img.shields.io/discord/429907082951524364.svg
 [dht22]: https://esphome.io/components/sensor/dht.html

esphome/config.json

@@ -5,7 +5,7 @@
     "aarch64"
   ],
   "auth_api": true,
-  "description": "ESPHome Hass.io add-on for intelligently managing all your ESP8266/ESP32 devices.",
+  "description": "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices",
   "hassio_api": true,
   "host_network": true,
   "image": "esphome/esphome-hassio-{arch}",
@@ -21,7 +21,7 @@
     "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?",
@@ -34,7 +34,10 @@
     "streamer_mode": "bool?"
   },
   "slug": "esphome",
+  "snapshot_exclude": [
+    "*/*/"
+  ],
   "uart": true,
   "url": "https://esphome.io/",
-  "version": "1.18.0"
+  "version": "1.20.4"
 }

template/CHANGELOG.md

@@ -0,0 +1 @@
+See https://esphome.io/changelog/index.html

template/README.md

@@ -1,6 +1,6 @@
 # ESPHome Home Assistant Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
 
 [![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
 [![GitHub Release][releases-shield]][releases]
@@ -14,7 +14,7 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.
 
 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
 </p>
 
 [View the ESPHome documentation](https://esphome.io/)
@@ -26,11 +26,11 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:
 
-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
 
 Then just click UPLOAD and the sensor will magically appear in Home Assistant:
 
-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/master/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
 
 [discord-shield]: https://img.shields.io/discord/429907082951524364.svg
 [dht22]: https://esphome.io/components/sensor/dht.html

template/addon_config.yaml

@@ -1,11 +1,14 @@
 ---
+# When changing options in this file, please also run:
+#    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/
   arch:
     - amd64
     - armv7
     - aarch64
-  # Uses Hass.io API (auth)
+  # Uses Home Assistant Supervisor API (auth)
   hassio_api: true
   auth_api: true
   # Host network mode for mDNS
@@ -14,12 +17,12 @@ base: &base
   ingress: true
   ingress_port: 0
   panel_icon: 'mdi:chip'
-  # Automatically add UART devices to addon
+  # Automatically add UART devices to add-on
   uart: true
   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)"
   map:
     - ssl:ro
     - config:rw
@@ -28,10 +31,11 @@ base: &base
     certfile: str?
     keyfile: str?
     leave_front_door_open: bool?
-    esphome_version: str?
     streamer_mode: bool?
     relative_url: str?
     status_use_ping: bool?
+  snapshot_exclude:
+    - "*/*/"
   base_image: esphome/esphome-hassio-base-{arch}:3.1.0
 
 esphome-dev:
@@ -40,19 +44,17 @@ esphome-dev:
   name: ESPHome (dev)
   version: 'dev'  # DEV
   slug: esphome-dev
-  description: "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files"
+  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.19.0b2'  # BETA
+  version: '1.21.0b2'  # BETA
   slug: esphome-beta
-  description: "Beta version of ESPHome add-on."
+  description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
   image: esphome/esphome-hassio-{arch}
   stage: experimental
@@ -61,9 +63,9 @@ esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '1.18.0'  # STABLE
+  version: '1.20.4'  # STABLE
   slug: esphome
-  description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices."
+  description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: esphome/esphome-hassio-{arch}
 
 copy_files:
@@ -71,3 +73,4 @@ copy_files:
   logo.png:
   README.md:
   DOCS.md:
+  CHANGELOG.md: