Bump version to v1.20.2

Revert "Rename snapshot_exclude to backup_exclude (#35 )" (#37 )
This reverts commit 12df7591ae.
2021-07-29 08:46:16 +00:00 · 2021-07-29 20:38:37 +12:00 · 2021-07-29 20:14:20 +12:00 · 2021-07-29 09:51:16 +02:00 · 2021-07-26 23:03:24 +00:00 · 2021-07-21 20:37:55 +00:00
12 changed files with 64 additions and 36 deletions
--- a/.github/workflows/lint.yml
+++ b/.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:
-         channel: [esphome, esphome-beta, esphome-dev]
+      matrix:
+        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
-      - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channel }}
+        run: python script/generate.py ${{ matrix.channels.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 }}"
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -0,0 +1 @@
+See https://esphome.io/changelog/index.html
--- a/esphome-beta/README.md
+++ b/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
--- a/esphome-beta/config.json
+++ b/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,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,8 +34,11 @@
    "streamer_mode": "bool?"
  },
  "slug": "esphome-beta",
+  "snapshot_exclude": [
+    "*/*/"
+  ],
  "stage": "experimental",
  "uart": true,
  "url": "https://beta.esphome.io/",
-  "version": "1.19.1"
+  "version": "1.20.2"
 }
--- a/esphome-dev/README.md
+++ b/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
--- a/esphome-dev/config.json
+++ b/esphome-dev/config.json
@@ -36,6 +36,9 @@
    "streamer_mode": "bool?"
  },
  "slug": "esphome-dev",
+  "snapshot_exclude": [
+    "*/*/"
+  ],
  "stage": "experimental",
  "uart": true,
  "url": "https://next.esphome.io/",
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -0,0 +1 @@
+See https://esphome.io/changelog/index.html
--- a/esphome/README.md
+++ b/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
--- a/esphome/config.json
+++ b/esphome/config.json
@@ -5,7 +5,7 @@
    "aarch64"
  ],
  "auth_api": true,
-  "description": "ESPHome 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.19.1"
+  "version": "1.20.2"
 }
--- a/template/CHANGELOG.md
+++ b/template/CHANGELOG.md
@@ -0,0 +1 @@
+See https://esphome.io/changelog/index.html
--- a/template/README.md
+++ b/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
--- a/template/addon_config.yaml
+++ b/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
@@ -32,6 +35,8 @@ base: &base
    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,7 +45,7 @@ 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:
@@ -50,9 +55,9 @@ esphome-beta:
  <<: *base
  directory: esphome-beta
  name: ESPHome (beta)
-  version: '1.19.1'  # BETA
+  version: '1.20.2'  # 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 +66,9 @@ esphome-stable:
  <<: *base
  directory: esphome
  name: ESPHome
-  version: '1.19.1'  # STABLE
+  version: '1.20.2'  # 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 +76,4 @@ copy_files:
  logo.png:
  README.md:
  DOCS.md:
+  CHANGELOG.md:
				`@@ -0,0 +1 @@`
				`See https://esphome.io/changelog/index.html`