Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-29 18:24:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'release' into dev

Browse source
This commit is contained in:
Jesse Hills 2021-08-18 15:17:33 +12:00
commit 29db77c9c9
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/release.yml vendored
View file

@ -19,7 +19,7 @@ jobs:
id: tag id: tag
run: | run: |
if [[ "$GITHUB_EVENT_NAME" = "release" ]]; then if [[ "$GITHUB_EVENT_NAME" = "release" ]]; then
TAG="${GITHUB_REF#refs/tags/v}" TAG="${GITHUB_REF#refs/tags/}"
else else
TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p") TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
today="$(date --utc '+%Y%m%d')" today="$(date --utc '+%Y%m%d')"
@ -138,7 +138,7 @@ jobs:
- env: - env:
TOKEN: ${{ secrets.DEPLOY_HASSIO_TOKEN }} TOKEN: ${{ secrets.DEPLOY_HASSIO_TOKEN }}
run: | run: |
TAG="${GITHUB_REF#refs/tags/v}" TAG="${GITHUB_REF#refs/tags/}"
curl \ curl \
-u ":$TOKEN" \ -u ":$TOKEN" \
-X POST \ -X POST \

3
esphome/components/midea_ac/midea_climate.h
View file

@ -6,6 +6,9 @@
#include "esphome/components/sensor/sensor.h" #include "esphome/components/sensor/sensor.h"
#include "esphome/components/midea_dongle/midea_dongle.h" #include "esphome/components/midea_dongle/midea_dongle.h"
#include "esphome/components/climate/climate.h" #include "esphome/components/climate/climate.h"
#include "esphome/components/midea_dongle/midea_dongle.h"
#include "esphome/components/sensor/sensor.h"
#include "esphome/core/component.h"
#include "midea_frame.h" #include "midea_frame.h"
namespace esphome { namespace esphome {

2
esphome/const.py
View file

@ -1,6 +1,6 @@
"""Constants used by esphome.""" """Constants used by esphome."""
__version__ = "1.22.0-dev" __version__ = "2021.8.0"
ESP_PLATFORM_ESP32 = "ESP32" ESP_PLATFORM_ESP32 = "ESP32"
ESP_PLATFORM_ESP8266 = "ESP8266" ESP_PLATFORM_ESP8266 = "ESP8266"