Skip to content

Commit

Permalink
Merge branch 'master' into kodi-play-camera
Browse files Browse the repository at this point in the history
  • Loading branch information
kylegordon authored Oct 9, 2023
2 parents e8d81f0 + 903a262 commit 545eb5e
Show file tree
Hide file tree
Showing 622 changed files with 62,809 additions and 4,635 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"
26 changes: 26 additions & 0 deletions .github/workflows/esphome-dummy.yaml
Original file line number Diff line number Diff line change
@@ -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"'
114 changes: 114 additions & 0 deletions .github/workflows/esphome-parallel.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
---
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
name: Discover ESPHome files
runs-on: ubuntu-latest
outputs:
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@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-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@v4
- name: ESPHome Version
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
- 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-stable, loop-beta, loop-dev]
steps:
- name: Getting your configuration from GitHub
uses: actions/checkout@v4
46 changes: 0 additions & 46 deletions .github/workflows/esphome.yaml

This file was deleted.

20 changes: 10 additions & 10 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Home Assistant CI
name: Home Assistant

# yamllint disable-line rule:truthy
on:
Expand All @@ -13,28 +13,28 @@ 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
continue-on-error: true
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: true
continue-on-error: false
with:
args: "remark --no-stdout --color --frail --use preset-lint-recommended ."
home_assistant_stable:
runs-on: ubuntu-latest
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
3 changes: 2 additions & 1 deletion .github/yamllint-config.yaml → .github/yamllint-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ rules:
ignore: |
lovelace-ui.yaml
custom_components/
www/lovelace-auto-entities/
.git
.github/workflows/yaml-lint.yaml
themes/
esphome/
esphome/common/colours.yaml
1 change: 1 addition & 0 deletions .remarkignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
www/lovelace-auto-entities/
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 0 additions & 3 deletions apps.yaml

This file was deleted.

1 change: 0 additions & 1 deletion automation/ChickenCare.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ action:
message: >
{{ trigger.to_state.attributes.friendly_name }} changed from {{ trigger.from_state.state}} to {{ trigger.to_state.state }}
Bring in the chickens water to stop it freezing
10 changes: 7 additions & 3 deletions automation/TimedTriggers/alarm_clock_morning.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand All @@ -38,5 +42,5 @@ action:
entity_id: light.master_bedroom, light.bedside_charlotte, light.bedside_kyle
data:
brightness_pct: 100
#color_temp: 260
# color_temp: 260
transition: 1200
16 changes: 0 additions & 16 deletions automation/TimedTriggers/bedtime_on.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions automation/TimedTriggers/turn_off_bedside_lights.yaml

This file was deleted.

21 changes: 21 additions & 0 deletions automation/aurora_alert.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
alias: Aurora Alert
trigger:
platform: numeric_state
entity_id: sensor.aurora_visibility
above: 1
action:
- service: notify.alexa_media_everywhere
data:
message: "Alert! The Aurora Borealis might be visible right now!"
data:
type: announce
# method: all
- service: notify.email_kyle
data:
title: "Aurora Alert"
message: "Alert! The Aurora Borealis might be visible right now!"
- service: notify.mobile_app_nothing_phone_1
data:
title: "Aurora Alert"
message: "Alert! The Aurora Borealis might be visible right now!"
25 changes: 0 additions & 25 deletions automation/back_motion_night.yaml

This file was deleted.

Loading

0 comments on commit 545eb5e

Please sign in to comment.