Bump version to 2022.3.0

Co-authored-by: Franck Nijhof <frenck@frenck.nl>

.github/workflows/bump-version.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   create-release:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
@@ -23,17 +24,18 @@ jobs:
         git config user.name esphomebot
         git config user.email esphome@nabucasa.com
         git add .
-        git commit -m "Bump version to v${{ github.event.inputs.version }}"
+        git commit -m "Bump version to ${{ github.event.inputs.version }}"
         git push
         COMMIT=$(git rev-parse HEAD)
         echo "::set-output name=commit_sha::${COMMIT}"
     - if: ${{ contains(github.event.inputs.version, 'b') }}
       name: Create Beta Release
       uses: actions/create-release@v1
+      continue-on-error: true
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        tag_name: v${{ github.event.inputs.version }}
+        tag_name: ${{ github.event.inputs.version }}
         release_name: ${{ github.event.inputs.version }}
         body: 'See https://beta.esphome.io/changelog/index.html'
         prerelease: true
@@ -41,10 +43,11 @@ jobs:
     - if: ${{ !contains(github.event.inputs.version, 'b') }}
       name: Create Stable Release
       uses: actions/create-release@v1
+      continue-on-error: true
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        tag_name: v${{ github.event.inputs.version }}
+        tag_name: ${{ github.event.inputs.version }}
         release_name: ${{ github.event.inputs.version }}
         body: 'See https://esphome.io/changelog/index.html'
         prerelease: false
@@ -54,20 +57,30 @@ jobs:
     runs-on: ubuntu-latest
     needs: [create-release]
     steps:
-    - name: Publish beta release to community-addons repository
-      run: |
-        docker run --rm hassioaddons/repository-updater:latest \
-          --repository hassio-addons/repository-beta \
-          --addon esphome \
-          --token "${TOKEN}"
-      env:
-        TOKEN: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
-    - if: ${{ !contains(github.event.inputs.version, 'b') }}
-      name: Publish stable release to community-addons repository
-      run: |
-        docker run --rm hassioaddons/repository-updater:latest \
-          --repository hassio-addons/repository \
-          --addon esphome \
-          --token "${TOKEN}"
-      env:
-        TOKEN: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
+      - name: Publish beta release to community-addons repository
+        uses: peter-evans/repository-dispatch@v1.1.3
+        with:
+          token: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
+          repository: hassio-addons/repository-beta
+          event-type: update
+          client-payload: >
+            {
+              "addon": "esphome",
+              "name": "ESPHome",
+              "repository": "esphome/home-assistant-addon",
+              "version": "${{ github.event.inputs.version }}"
+            }
+      - if: ${{ !contains(github.event.inputs.version, 'b') }}
+        name: Publish stable release to community-addons repository
+        uses: peter-evans/repository-dispatch@v1.1.3
+        with:
+          token: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
+          repository: hassio-addons/repository
+          event-type: update
+          client-payload: >
+            {
+              "addon": "esphome",
+              "name": "ESPHome",
+              "repository": "esphome/home-assistant-addon",
+              "version": "${{ github.event.inputs.version }}"
+            }

.github/workflows/deploy-community.yml

@@ -0,0 +1,46 @@
+name: Update Community Repo
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: The version to release
+        required: true
+      beta:
+        description: Whether to release a beta version
+        type: boolean
+        required: false
+        default: false
+
+jobs:
+  deploy-community-addons:
+    runs-on: ubuntu-latest
+    steps:
+      - if: ${{ contains(github.event.inputs.version, 'b') || github.event.inputs.beta == 'true' }}
+        name: Publish beta release to community-addons repository
+        uses: peter-evans/repository-dispatch@v1.1.3
+        with:
+          token: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
+          repository: hassio-addons/repository-beta
+          event-type: update
+          client-payload: >
+            {
+              "addon": "esphome",
+              "name": "ESPHome",
+              "repository": "esphome/home-assistant-addon",
+              "version": "${{ github.event.inputs.version }}"
+            }
+      - if: ${{ !contains(github.event.inputs.version, 'b') }}
+        name: Publish stable release to community-addons repository
+        uses: peter-evans/repository-dispatch@v1.1.3
+        with:
+          token: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
+          repository: hassio-addons/repository
+          event-type: update
+          client-payload: >
+            {
+              "addon": "esphome",
+              "name": "ESPHome",
+              "repository": "esphome/home-assistant-addon",
+              "version": "${{ github.event.inputs.version }}"
+            }

.gitignore

@@ -1,3 +1,4 @@
 __pycache__/
 *.py[cod]
 *$py.class
+venv/

esphome-beta/config.json

@@ -1,4 +1,5 @@
 {
+  "advanced": true,
   "arch": [
     "amd64",
     "armv7",
@@ -39,5 +40,5 @@
   "stage": "experimental",
   "uart": true,
   "url": "https://beta.esphome.io/",
-  "version": "2021.9.2"
+  "version": "2022.3.0"
 }

esphome-dev/config.json

@@ -1,4 +1,5 @@
 {
+  "advanced": true,
   "arch": [
     "amd64",
     "armv7",

esphome-dev/rootfs/etc/cont-init.d/30-esphome-fork.sh

@@ -18,12 +18,18 @@ if bashio::config.has_value 'esphome_fork'; then
       username="esphome"
       ref=$esphome_fork
     fi
-    full_url="https://github.com/${username}/esphome/archive/${ref}.zip"
+    full_url="https://github.com/${username}/esphome/archive/${ref}.tar.gz"
     bashio::log.info "Checking forked ESPHome"
     dev_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
-    bashio::log.info "Installing esphome from fork '${esphome_fork}' (${full_url})..."
-    pip3 install -U --no-cache-dir "${full_url}" -qq \
-      || bashio::exit.nok "Failed installing esphome pinned version."
+    bashio::log.info "Downloading ESPHome from fork '${esphome_fork}' (${full_url})..."
+    curl -L -o /tmp/esphome.tar.gz "${full_url}" -qq \
+      || bashio::exit.nok "Failed downloading ESPHome fork."
+    bashio::log.info "Installing ESPHome from fork '${esphome_fork}' (${full_url})..."
+    mkdir /esphome-fork
+    tar -zxf /tmp/esphome.tar.gz -C /esphome-fork --strip-components=1 \
+      || bashio::exit.nok "Failed installing ESPHome from fork."
+    pip install -U -e /esphome-fork || bashio::exit.nok "Failed installing ESPHome from fork."
+    rm -f /tmp/esphome.tar.gz
     fork_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
 
     if [[ "$fork_version" != "$dev_version" ]]; then
@@ -36,4 +42,5 @@ if bashio::config.has_value 'esphome_fork'; then
       bashio::log.error "############################"
       bashio::exit.nok
     fi
+    bashio::log.info "Installed ESPHome from fork '${esphome_fork}' (${full_url})..."
 fi

esphome/config.json

@@ -38,5 +38,5 @@
   "slug": "esphome",
   "uart": true,
   "url": "https://esphome.io/",
-  "version": "2021.9.2"
+  "version": "2022.3.0"
 }

repository.json

@@ -1,5 +1,5 @@
 {
-  "name": "ESPHome Home Assistant Add-Ons",
-  "url": "https://github.com/esphome/hassio",
+  "name": "ESPHome",
+  "url": "https://esphome.io",
   "maintainer": "ESPHome <esphome@nabucasa.com>"
 }

template/addon_config.yaml

@@ -46,6 +46,7 @@ esphome-dev:
   description: "Development version of ESPHome add-on"
   url: https://next.esphome.io/
   stage: experimental
+  advanced: true
   schema:
     ssl: bool?
     certfile: str?
@@ -61,18 +62,19 @@ esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: '2021.9.2'  # BETA
+  version: '2022.3.0'  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
   image: ghcr.io/esphome/esphome-hassio-{arch}
   stage: experimental
+  advanced: true
 
 esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '2021.9.2'  # STABLE
+  version: '2022.3.0'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio-{arch}