Bump version to 2023.6.2

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/bump-version.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.3
     - uses: actions/setup-python@v4
       with:
         python-version: '3.x'

.github/workflows/devcontainer-build.yaml

@@ -19,20 +19,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         if: github.event_name != 'pull_request'
         with:
             registry: ghcr.io
             username: ${{ github.repository_owner }}
             password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.4.1
+        uses: docker/setup-buildx-action@v2.7.0
       - name: Build and Push
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v4.1.1
         with:
           context: .
           file: .devcontainer/Dockerfile

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
             channel: dev
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.3
       - name: 🛠 Setup Python
         uses: actions/setup-python@v4
         with:
@@ -29,6 +29,6 @@ jobs:
       - name: 🛠 Generate files from template
         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.11.0
+        uses: frenck/action-addon-linter@v2.13.1
         with:
           path: "./${{ matrix.channels.folder }}"

esphome-beta/CHANGELOG.md

@@ -1,7 +1,5 @@
-## 2023.4.0b2
+## 2023.6.2
 
-- debug component, allow without debug logging [esphome#4685](https://github.com/esphome/esphome/pull/4685) by [@jesserockz](https://github.com/jesserockz)
+- remove unused static declarations [esphome#4993](https://github.com/esphome/esphome/pull/4993) by [@ssieb](https://github.com/ssieb)
-- Fixed dns2 for ethernet [esphome#4698](https://github.com/esphome/esphome/pull/4698) by [@HeMan](https://github.com/HeMan)
+- Fix rp2040 pio tool download [esphome#4994](https://github.com/esphome/esphome/pull/4994) by [@jesserockz](https://github.com/jesserockz) (new-integration)
-- Add timeout to i2c write error logs [esphome#4697](https://github.com/esphome/esphome/pull/4697) by [@Szewcson](https://github.com/Szewcson)
-- Add event triggers to voice_assistant [esphome#4699](https://github.com/esphome/esphome/pull/4699) by [@jesserockz](https://github.com/jesserockz)
 

esphome-beta/DOCS.md

@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
+# ESPHome Add-on
-
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.

esphome-beta/README.md

@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Beta Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]
 
-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
+[![GitHub stars][github-stars-shield]][repository]
-[![GitHub Release][releases-shield]][releases]
 [![Discord][discord-shield]][discord]
 
 ## About
@@ -14,10 +13,10 @@ 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/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/screenshot.png" width="700px"></img>
 </p>
 
-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]
 
 ## Example
 
@@ -26,15 +25,17 @@ 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/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/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/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/temperature-humidity.png" width="600px"></img>
 
-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://beta.esphome.io/components/sensor/dht.html
+[releases]: https://beta.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/logo.png
+[website]: https://beta.esphome.io/

esphome-beta/config.yaml

@@ -32,7 +32,7 @@ backup_exclude:
 - '*/*/'
 init: false
 name: ESPHome (beta)
-version: 2023.4.0b2
+version: 2023.6.2
 slug: esphome-beta
 description: Beta version of ESPHome add-on
 image: ghcr.io/esphome/esphome-hassio

esphome-dev/README.md

@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Dev Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]
 
-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
+[![GitHub stars][github-stars-shield]][repository]
-[![GitHub Release][releases-shield]][releases]
 [![Discord][discord-shield]][discord]
 
 ## About
@@ -14,10 +13,10 @@ 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/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/screenshot.png" width="700px"></img>
 </p>
 
-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]
 
 ## Example
 
@@ -26,15 +25,17 @@ 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/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/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/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/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
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://next.esphome.io/components/sensor/dht.html
+[releases]: https://next.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/logo.png
+[website]: https://next.esphome.io/

esphome/CHANGELOG.md

@@ -1,7 +1,5 @@
-## 2023.3.2
+## 2023.6.2
 
-- Fix compile error on pzemdc.h [esphome#4583](https://github.com/esphome/esphome/pull/4583) by [@KG3RK3N](https://github.com/KG3RK3N)
+- remove unused static declarations [esphome#4993](https://github.com/esphome/esphome/pull/4993) by [@ssieb](https://github.com/ssieb)
-- Swap curly brackets for round on LockGuard [esphome#4610](https://github.com/esphome/esphome/pull/4610) by [@jesserockz](https://github.com/jesserockz)
+- Fix rp2040 pio tool download [esphome#4994](https://github.com/esphome/esphome/pull/4994) by [@jesserockz](https://github.com/jesserockz) (new-integration)
-- Fix animation resizing [esphome#4608](https://github.com/esphome/esphome/pull/4608) by [@guillempages](https://github.com/guillempages)
-- SX1509 minimum loop period (fixes esphome/issues#4325) [esphome#4613](https://github.com/esphome/esphome/pull/4613) by [@tracestep](https://github.com/tracestep)
 

esphome/DOCS.md

@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
+# ESPHome Add-on
-
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.

esphome/README.md

@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]
 
-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
+[![GitHub stars][github-stars-shield]][repository]
-[![GitHub Release][releases-shield]][releases]
 [![Discord][discord-shield]][discord]
 
 ## About
@@ -14,10 +13,10 @@ 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/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/screenshot.png" width="700px"></img>
 </p>
 
-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]
 
 ## Example
 
@@ -26,15 +25,17 @@ 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/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/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/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/temperature-humidity.png" width="600px"></img>
 
-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://esphome.io/components/sensor/dht.html
+[releases]: https://esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome/logo.png
+[website]: https://esphome.io/

esphome/config.yaml

@@ -32,7 +32,7 @@ backup_exclude:
 - '*/*/'
 init: false
 name: ESPHome
-version: 2023.3.2
+version: 2023.6.2
 slug: esphome
 description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
 image: ghcr.io/esphome/esphome-hassio

script/generate.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from enum import Enum
 from shutil import copyfile
 import sys
+import os
 
 
 class Channel(Enum):
@@ -37,7 +38,8 @@ def main(args):
         with open(path, "w") as f:
             yaml.dump(conf, f, indent=2, sort_keys=False, explicit_start=True)
 
-        for file_, conf_ in copyf.items():
+        for file_ in copyf:
+            os.makedirs(dir_ / Path(file_).parent, exist_ok=True)
             if Path.exists(templ / channel.value / file_):
                 copyfile(templ / channel.value / file_, dir_ / file_)
             else:

template/CHANGELOG.md

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

template/DOCS.md

@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
+# ESPHome Add-on
-
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.

template/README.md

@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]
 
-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
+[![GitHub stars][github-stars-shield]][repository]
-[![GitHub Release][releases-shield]][releases]
 [![Discord][discord-shield]][discord]
 
 ## About
@@ -14,10 +13,10 @@ 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/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/screenshot.png" width="700px"></img>
 </p>
 
-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]
 
 ## Example
 
@@ -26,15 +25,17 @@ 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/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/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/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/temperature-humidity.png" width="600px"></img>
 
-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://esphome.io/components/sensor/dht.html
+[releases]: https://esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome/logo.png
+[website]: https://esphome.io/

template/addon_config.yaml

@@ -70,7 +70,7 @@ esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: '2023.4.0b2'  # BETA
+  version: '2023.6.2'  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
@@ -84,15 +84,17 @@ esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '2023.3.2'  # STABLE
+  version: '2023.6.2'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio
 
 copy_files:
-  CHANGELOG.md:
+  - DOCS.md
-  DOCS.md:
+  - icon.png
-  icon.png:
+  - logo.png
-  logo.png:
+  - README.md
-  README.md:
+  - translations/en.yaml
-  translations/en.yaml:
+  - images/dht-example.png
+  - images/screenshot.png
+  - images/temperature-humidity.png

template/beta/README.md

@@ -0,0 +1,41 @@
+# ESPHome Beta Add-On
+
+[![ESPHome logo][logo]][website]
+
+[![GitHub stars][github-stars-shield]][repository]
+[![Discord][discord-shield]][discord]
+
+## About
+
+This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers
+directly through Home Assistant **with no programming experience required**. All you need to do
+is write YAML configuration files; the rest (over-the-air updates, compiling) is all
+handled by ESPHome.
+
+<p align="center">
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/screenshot.png" width="700px"></img>
+</p>
+
+[View the ESPHome documentation][website]
+
+## Example
+
+With ESPHome, you can go from a few lines of YAML straight to a custom-made
+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://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/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 discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/temperature-humidity.png" width="600px"></img>
+
+[discord]: https://discord.gg/KhAMKrd
+[repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://beta.esphome.io/components/sensor/dht.html
+[releases]: https://beta.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/logo.png
+[website]: https://beta.esphome.io/

template/dev/README.md

@@ -0,0 +1,41 @@
+# ESPHome Dev Add-On
+
+[![ESPHome logo][logo]][website]
+
+[![GitHub stars][github-stars-shield]][repository]
+[![Discord][discord-shield]][discord]
+
+## About
+
+This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers
+directly through Home Assistant **with no programming experience required**. All you need to do
+is write YAML configuration files; the rest (over-the-air updates, compiling) is all
+handled by ESPHome.
+
+<p align="center">
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/screenshot.png" width="700px"></img>
+</p>
+
+[View the ESPHome documentation][website]
+
+## Example
+
+With ESPHome, you can go from a few lines of YAML straight to a custom-made
+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://github.com/esphome/home-assistant-addon/raw/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 discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+
+[discord]: https://discord.gg/KhAMKrd
+[repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://next.esphome.io/components/sensor/dht.html
+[releases]: https://next.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/logo.png
+[website]: https://next.esphome.io/