Merge branch 'master' into frigate-notifications

.github/workflows/esphome-dummy.yaml

@@ -0,0 +1,24 @@
+---
+name: ESPHome
+
+## This workflow exists to keep branch protection happy in the event of no changes being made to the esphome directory.
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    paths-ignore:
+      - 'esphome/**'
+  push:
+    branches: [main]
+    paths-ignore:
+      - 'esphome/**'
+  schedule:
+    - cron: 0 12 * * *
+
+jobs:
+  # This is used by branch protections
+  final:
+    name: Final ESPHome check
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo "No build required"'

.github/workflows/esphome-parallel.yaml

@@ -1,10 +1,17 @@
+---
 name: ESPHome
 
 # yamllint disable-line rule:truthy
 on:
   pull_request:
+    paths:
+      - 'esphome/**'
   push:
     branches: [main]
+    paths:
+      - 'esphome/**'
+  schedule:
+    - cron: 0 12 * * *
 
 jobs:
   files:  # Job that lists files
@@ -20,8 +27,8 @@ jobs:
         run: echo "::set-output name=file::$(ls esphome/*.yaml | jq -R -s -c 'split("\n")[:-1]')"
         # Define step output named file base on ls command transformed to JSON thanks to jq
 
-  loop:
-    name: Test ESPHome firmware
+  loop-stable:
+    name: Test ESPHome Stable firmware
     runs-on: ubuntu-latest
     needs: [files]  # Depends on previous job
     strategy:
@@ -31,7 +38,7 @@ jobs:
       - name: Getting your configuration from GitHub
         uses: actions/checkout@v2
       - name: ESPHome Version
-        uses: "docker://esphome/esphome:latest"
+        uses: "docker://esphome/esphome:stable"
         with:
           args: "version"
       - name: Copy stub files into configuration folder
@@ -40,12 +47,57 @@ jobs:
           cp -R esphome/travis_secrets.yaml.txt esphome/common/secrets.yaml
           cp -R esphome/travis_secrets.yaml.txt esphome/secrets.yaml
       - run: echo Compiling ${{matrix.file}}
-      - run: docker run --rm -v "${PWD}":/config esphome/esphome:latest compile ${{matrix.file}}
+      - run: docker run --rm -v "${PWD}":/config esphome/esphome:stable compile ${{matrix.file}}
 
+  loop-beta:
+    name: Test ESPHome Beta firmware
+    runs-on: ubuntu-latest
+    needs: [files]  # Depends on previous job
+    strategy:
+      matrix:
+        file: ${{fromJson(needs.files.outputs.file)}}  # List matrix strategy from files dynamically
+    steps:
+      - name: Getting your configuration from GitHub
+        uses: actions/checkout@v2
+      - name: ESPHome Version
+        uses: "docker://esphome/esphome:beta"
+        with:
+          args: "version"
+      - name: Copy stub files into configuration folder
+        if: ${{ steps.esphome-test-required.outputs.ESPHOME_CHANGES != 'false' }}
+        run: |
+          cp -R esphome/travis_secrets.yaml.txt esphome/common/secrets.yaml
+          cp -R esphome/travis_secrets.yaml.txt esphome/secrets.yaml
+      - run: echo Compiling ${{matrix.file}}
+      - run: docker run --rm -v "${PWD}":/config esphome/esphome:beta compile ${{matrix.file}}
+
+  loop-dev:
+    name: Test ESPHome Dev firmware
+    runs-on: ubuntu-latest
+    needs: [files]  # Depends on previous job
+    strategy:
+      matrix:
+        file: ${{fromJson(needs.files.outputs.file)}}  # List matrix strategy from files dynamically
+    steps:
+      - name: Getting your configuration from GitHub
+        uses: actions/checkout@v2
+      - name: ESPHome Version
+        uses: "docker://esphome/esphome:dev"
+        with:
+          args: "version"
+      - name: Copy stub files into configuration folder
+        if: ${{ steps.esphome-test-required.outputs.ESPHOME_CHANGES != 'false' }}
+        run: |
+          cp -R esphome/travis_secrets.yaml.txt esphome/common/secrets.yaml
+          cp -R esphome/travis_secrets.yaml.txt esphome/secrets.yaml
+      - run: echo Compiling ${{matrix.file}}
+      - run: docker run --rm -v "${PWD}":/config esphome/esphome:dev compile ${{matrix.file}}
+
+  # This is used by branch protections
   final:
     name: Final ESPHome check
     runs-on: ubuntu-latest
-    needs: [loop]
+    needs: [loop-stable, loop-beta, loop-dev]
     steps:
       - name: Getting your configuration from GitHub
         uses: actions/checkout@v2

.github/workflows/main.yaml

@@ -20,7 +20,7 @@ jobs:
         with:
           config_file: .github/yamllint-config.yml
   remarklint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Getting your configuration from GitHub
         uses: actions/checkout@v1

automation/TimedTriggers/alarm_clock_morning.yaml

@@ -1,10 +1,11 @@
+---
 alias: "Wakeup transition"
 trigger:
   - platform: time
     at: '07:15:00'
 condition:
   - condition: state
-    entity_id: calendar.holiday_mode
+    entity_id: binary_sensor.holiday_mode
     state: 'off'
   - condition: or
     conditions:

automation/bin_notification.yaml

@@ -1,7 +1,7 @@
 alias: 'Bin notification'
 trigger:
   - platform: template
-    value_template: '{{ states.sensor.date.state == strptime(states.calendar.next_bin.attributes.start_time, "%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%d")}}'
+    value_template: '{{ states.sensor.date.state == strptime(states.calendar.garbage_collection.attributes.start_time, "%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%d")}}'
   - platform: time
     at: '17:00:00'
 condition:
@@ -19,5 +19,5 @@ condition:
 action:
 - service: persistent_notification.create
   data:
-    message: "Next bin: {{ states.calendar.next_bin.attributes.message }}. "
+    message: "Next bin: {{ states.calendar.garbage_collection.attributes.message }}. "
     title: "Bin Reminder"

automation/craftroom_touch_toggle.yaml

@@ -1,9 +1,11 @@
+---
 alias: Craft Room light toggle
 trigger:
-  - platform: state
-    entity_id: binary_sensor.craft_room_switch_touch_pad
-    to: 'on'
-
+      - platform: event
+        event_type: esphome.button_pressed
+        event_data:
+          device_name: craftroom_switch
+          click_type: single
 action:
   - service: switch.turn_on
     entity_id: switch.craft_room_switch_relay