Skip to content

Commit

Permalink
Merge pull request #36 from edwardtfn/dev
Browse files Browse the repository at this point in the history
v0.0.4 - Bug fixes
  • Loading branch information
edwardtfn authored Dec 20, 2024
2 parents f65f3a9 + ce9aefc commit 61a5d67
Show file tree
Hide file tree
Showing 17 changed files with 2,252 additions and 1,838 deletions.
30 changes: 6 additions & 24 deletions .github/workflows/validate_esphome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,6 @@ name: Validate ESPHome

# yamllint disable-line rule:truthy
on:
push:
paths:
- "*.yaml"
- "prebuilt/*.yaml"
- ".test/*.yaml"
- "*.h"
- "*.c"
- "*.cpp"
- "*.py"
pull_request:
paths:
- "*.yaml"
- "prebuilt/*.yaml"
- ".test/*.yaml"
- "*.h"
- "*.c"
- "*.cpp"
- "*.py"
workflow_dispatch:

concurrency:
Expand Down Expand Up @@ -56,27 +38,27 @@ jobs:
- name: Build core
uses: esphome/build-action@main
with:
yaml_file: ".test/esphome_ard_basic.yaml"
yaml-file: ".test/esphome_ard_basic.yaml"

build_bluetooth_proxy_4:
name: Bluetooth Proxy (IDF v4)
name: Bluetooth Proxy (IDF)
needs: build_basic
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@main
- name: Build core
uses: esphome/build-action@main
with:
yaml_file: ".test/esphome_idf_bluetooth_proxy.yaml"
yaml-file: ".test/esphome_idf_bluetooth_proxy.yaml"

build_bluetooth_proxy_5:
name: Bluetooth Proxy (IDF v5)
build_bluetooth_proxy_53:
name: Bluetooth Proxy (IDF v5.3)
needs: build_basic
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@main
- name: Build core
uses: esphome/build-action@main
with:
yaml_file: ".test/esphome_idf5_bluetooth_proxy.yaml"
yaml-file: ".test/esphome_idf53_bluetooth_proxy.yaml"
...
93 changes: 39 additions & 54 deletions .github/workflows/validate_esphome_beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,34 @@ name: Validate ESPHome (Beta)

# yamllint disable-line rule:truthy
on:
push:
paths:
- "*.yaml"
- "ESPHome/*.yaml"
- ".test/*.yaml"
- "*.h"
- "*.c"
- "*.cpp"
- "*.py"
pull_request:
paths:
- "*.yaml"
- "ESPHome/*.yaml"
- ".test/*.yaml"
- "*.h"
- "*.c"
- "*.cpp"
- "*.py"
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
setup_dependencies:
name: Setup & Cache Dependencies
runs-on: ubuntu-latest
outputs:
cache-hit-arduino: ${{ steps.cache-arduino.outputs.cache-hit }}

steps:
- name: Checkout repository
uses: actions/checkout@main

- name: Cache Arduino Dependencies
id: cache-arduino
uses: actions/cache@main
with:
path: |
~/.esphome/cache
~/.platformio/packages
~/.platformio/platforms
key: ${{ runner.os }}-arduino-${{ hashFiles('**/esphome_ard_basic.yaml') }}
restore-keys: |
${{ runner.os }}-arduino-
code_scan:
name: Code scan (YAML)
runs-on: "ubuntu-latest"
needs: setup_dependencies
steps:
- name: Checkout Code
uses: actions/checkout@main
Expand All @@ -53,48 +48,38 @@ jobs:

build_basic:
name: Basic
needs: [code_scan, setup_dependencies]
needs:
- code_scan
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- id: ard
yaml_file: ".test/esphome_ard_basic.yaml"
cache-hit: ${{ needs.setup_dependencies.outputs.cache-hit-arduino }}

steps:
- name: Checkout repository
uses: actions/checkout@main

- name: Firmware
if: steps.matrix.outputs.cache-hit != 'true'
- uses: actions/checkout@main
- name: Build core
uses: esphome/build-action@main
with:
yaml_file: ${{ matrix.yaml_file }}
yaml-file: ".test/esphome_ard_basic.yaml"
version: beta

build_bluetooth_proxy:
name: Bluetooth Proxy
build_bluetooth_proxy_4:
name: Bluetooth Proxy (IDF)
needs: build_basic
runs-on: ubuntu-latest
strategy:
matrix:
include:
- id: idf_v4
base: idf_v4
yaml_file: ".test/esphome_idf_bluetooth_proxy.yaml"
- id: idf_v5
base: idf_v5
yaml_file: ".test/esphome_idf5_bluetooth_proxy.yaml"

steps:
- name: Checkout repository
uses: actions/checkout@main
- uses: actions/checkout@main
- name: Build core
uses: esphome/build-action@main
with:
yaml-file: ".test/esphome_idf_bluetooth_proxy.yaml"
version: beta

- name: Build Bluetooth Proxy Firmware
build_bluetooth_proxy_53:
name: Bluetooth Proxy (IDF v5.3)
needs: build_basic
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@main
- name: Build core
uses: esphome/build-action@main
with:
yaml_file: ${{ matrix.yaml_file }}
yaml-file: ".test/esphome_idf53_bluetooth_proxy.yaml"
version: beta
...
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ packages:
esp32:
framework:
type: esp-idf
version: 5.0.2
platform_version: 6.3.2
version: 5.3.1
platform_version: 6.9.0
...
12 changes: 12 additions & 0 deletions ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
####################################################################################################
##### TX Ultimate Easy for ESPHome #####
##### Repository: https://github.com/edwardtfn/TX-Ultimate-Easy #####
####################################################################################################
##### Purpose: ESPHome Core - Add-on - BLE Proxy #####
####################################################################################################
##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo #####
####################################################################################################
##### NOTE: #####
##### - Make changes ONLY if absolutely necessary and you have the required knowledge. #####
##### - For normal system use, modifications to this file are NOT required. #####
####################################################################################################
---
bluetooth_proxy:

Expand Down
Loading

0 comments on commit 61a5d67

Please sign in to comment.