Merge branch 'master' into bed-sensor

kylegordon · Nov 16, 2023 · b8f0e89 · b8f0e89
2 parents c2a9792 + c454ec0
commit b8f0e89
Show file tree

Hide file tree

Showing 558 changed files with 53,191 additions and 8,772 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -0,0 +1,8 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "06:00"
diff --git a/.github/workflows/esphome-dummy.yaml b/.github/workflows/esphome-dummy.yaml
@@ -0,0 +1,26 @@
+---
+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/**'
+      - '.github/workflows/esphome**'
+  push:
+    branches: [main]
+    paths-ignore:
+      - 'esphome/**'
+      - '.github/workflows/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"'
diff --git a/.github/workflows/esphome-parallel.yaml b/.github/workflows/esphome-parallel.yaml
@@ -1,10 +1,19 @@
-name: ESPHome Parallel
+---
+name: ESPHome
 
 # yamllint disable-line rule:truthy
 on:
   pull_request:
+    paths:
+      - 'esphome/**'
+      - '.github/workflows/esphome**'
   push:
     branches: [main]
+    paths:
+      - 'esphome/**'
+      - '.github/workflows/esphome**'
+  schedule:
+    - cron: 0 12 * * *
 
 jobs:
   files:  # Job that lists files
@@ -14,38 +23,92 @@ jobs:
       file: ${{ steps.set-files.outputs.file }}  # generate output name file by using inner step output
     steps:
       - name: Getting your configuration from GitHub
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Get list of files
         id: set-files  # Give it an id to handle to get step outputs in the outputs key above
         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:
       matrix:
         file: ${{fromJson(needs.files.outputs.file)}}  # List matrix strategy from files dynamically
     steps:
       - name: Getting your configuration from GitHub
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: ESPHome Version
-        uses: "docker://esphome/esphome:latest"
+        uses: "docker://esphome/esphome:stable"
         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:latest compile ${{matrix.file}}
+      - name: Compile all ESPHome ${{matrix.file}}
+        uses: esphome/build-action@v1
+        with:
+          version: stable
+          yaml_file: ${{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@v4
+      - 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
+      - name: Compile all ESPHome ${{matrix.file}}
+        uses: esphome/build-action@v1
+        with:
+          version: beta
+          yaml_file: ${{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@v4
+      - 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
+      - name: Compile all ESPHome ${{matrix.file}}
+        uses: esphome/build-action@v1
+        with:
+          version: dev
+          yaml_file: ${{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
+        uses: actions/checkout@v4
diff --git a/.github/workflows/esphome.yaml.disabled b/.github/workflows/esphome.yaml.disabled
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,5 +1,5 @@
 ---
-name: Home Assistant CI
+name: Home Assistant
 
 # yamllint disable-line rule:truthy
 on:
@@ -13,17 +13,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Getting your configuration from GitHub
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Running YAMLlint
-        uses: ibiqlik/action-yamllint@v1
+        uses: ibiqlik/action-yamllint@v3
         continue-on-error: false
         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
+        uses: actions/checkout@v4
       - name: Running Remark lint
         uses: "docker://pipelinecomponents/remark-lint:latest"
         continue-on-error: false
@@ -34,7 +34,7 @@ jobs:
     needs: [yamllint, remarklint]
     steps:
       - name: Getting your configuration from GitHub
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Copy stub files into configuration folder
         run: |
           cp -R travis_secrets.yaml secrets.yaml
@@ -55,7 +55,7 @@ jobs:
     needs: [yamllint, remarklint]
     steps:
       - name: Getting your configuration from GitHub
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Copy stub files into configuration folder
         run: |
           cp -R travis_secrets.yaml secrets.yaml
@@ -76,7 +76,7 @@ jobs:
     needs: [yamllint, remarklint]
     steps:
       - name: Getting your configuration from GitHub
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Copy stub files into configuration folder
         run: |
           cp -R travis_secrets.yaml secrets.yaml

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/kylegordon/home-assistant-config.svg?branch=master)](https://travis-ci.org/kylegordon/home-assistant-config)
+![Home-Assistant](https://github.com/kylegordon/home-assistant-config/actions/workflows/main.yaml/badge.svg)  
+![ESPHome](https://github.com/kylegordon/home-assistant-config/actions/workflows/esphome-parallel.yaml/badge.svg)
 
 
 My Home-Assistant configuration.

diff --git a/automation/TimedTriggers/alarm_clock_morning.yaml b/automation/TimedTriggers/alarm_clock_morning.yaml
@@ -1,10 +1,11 @@
+---
 alias: "Wakeup transition"
 trigger:
   - platform: time
-    at: '06:45:00'
+    at: '07:15:00'
 condition:
   - condition: state
-    entity_id: calendar.holiday_mode
+    entity_id: binary_sensor.holiday_mode
     state: 'off'
   - condition: or
     conditions:
@@ -21,6 +22,9 @@ condition:
       - wed
       - thu
       - fri
+  - condition: numeric_state
+    entity_id: sensor.average_external_light_level
+    below: 500
 action:
   - service: logbook.log
     data_template:

diff --git a/automation/TimedTriggers/bedtime_on.yaml b/automation/TimedTriggers/bedtime_on.yaml
diff --git a/automation/TimedTriggers/turn_off_bedside_lights.yaml b/automation/TimedTriggers/turn_off_bedside_lights.yaml