Skip to content

Commit

Permalink
Merge branch 'master' into frigate-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
kylegordon committed Oct 10, 2023
2 parents c8dc16a + 903a262 commit ccea71a
Show file tree
Hide file tree
Showing 359 changed files with 29,358 additions and 4,026 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: daily
time: "06:00"
2 changes: 2 additions & 0 deletions .github/workflows/esphome-dummy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ on:
pull_request:
paths-ignore:
- 'esphome/**'
- '.github/workflows/esphome**'
push:
branches: [main]
paths-ignore:
- 'esphome/**'
- '.github/workflows/esphome**'
schedule:
- cron: 0 12 * * *

Expand Down
33 changes: 22 additions & 11 deletions .github/workflows/esphome-parallel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ on:
pull_request:
paths:
- 'esphome/**'
- '.github/workflows/esphome**'
push:
branches: [main]
paths:
- 'esphome/**'
- '.github/workflows/esphome**'
schedule:
- cron: 0 12 * * *

Expand All @@ -21,7 +23,7 @@ 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]')"
Expand All @@ -36,7 +38,7 @@ jobs:
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:stable"
with:
Expand All @@ -46,8 +48,11 @@ jobs:
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:stable 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
Expand All @@ -58,7 +63,7 @@ jobs:
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:beta"
with:
Expand All @@ -68,8 +73,11 @@ jobs:
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}}
- 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
Expand All @@ -80,7 +88,7 @@ jobs:
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:dev"
with:
Expand All @@ -90,8 +98,11 @@ jobs:
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}}
- 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:
Expand All @@ -100,4 +111,4 @@ jobs:
needs: [loop-stable, loop-beta, loop-dev]
steps:
- name: Getting your configuration from GitHub
uses: actions/checkout@v2
uses: actions/checkout@v4
12 changes: 6 additions & 6 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions automation/aurora_alert.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
alias: Aurora Alert
trigger:
platform: state
entity_id: binary_sensor.aurora_visibility_alert
from: "off"
to: "on"
platform: numeric_state
entity_id: sensor.aurora_visibility
above: 1
action:
- service: notify.alexa_media_everywhere
data:
Expand All @@ -16,7 +15,7 @@ action:
data:
title: "Aurora Alert"
message: "Alert! The Aurora Borealis might be visible right now!"
- service: notify.mobile_app
- service: notify.mobile_app_nothing_phone_1
data:
title: "Aurora Alert"
message: "Alert! The Aurora Borealis might be visible right now!"
14 changes: 0 additions & 14 deletions automation/classicfm.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions automation/craftroom_touch_toggle.yaml

This file was deleted.

5 changes: 3 additions & 2 deletions automation/living_room_sofa_dim.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
alias: Living Room TV dimmer
id: living_room_tv_dimmer
trigger:
- platform: state
entity_id: media_player.living_room_kodi
Expand All @@ -14,10 +15,10 @@ condition:
entity_id: light.living_room_2
state: 'on'
- condition: state
entity_id: light.dining_nook_group
entity_id: light.dining_nook
state: 'on'
action:
- service: light.turn_off
entity_id:
- light.living_room
- light.dining_nook_group
- light.dining_nook
2 changes: 1 addition & 1 deletion automation/mark_person_as_arrived.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ action:
"A resident has just arrived!"
] | random + " http://amzn.to/2D3J8jW" }}
- service: notify.twitter_thegordonhome
- service: notify.mastodon_viewpoint
data:
message: "A resident has just arrived!"
4 changes: 3 additions & 1 deletion automation/media_playing_night.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
alias: "Media playing at night"
id: media_playing_night
trigger:
- platform: state
entity_id: media_player.living_room_kodi
Expand All @@ -8,7 +10,7 @@ condition:
entity_id: sensor.average_external_light_level
below: 1000
- condition: state
entity_id: binary_sensor.kitchen_motion
entity_id: binary_sensor.kitchen_motion_occupancy
state: "off"
action:
- service: light.turn_off
Expand Down
2 changes: 2 additions & 0 deletions automation/media_stopped_night.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
alias: "Media stopped at night"
id: media_stopped_night
trigger:
- platform: state
entity_id: media_player.living_room_kodi
Expand Down
29 changes: 0 additions & 29 deletions cameras.yaml

This file was deleted.

Loading

0 comments on commit ccea71a

Please sign in to comment.