Skip to content

Commit 13eb2d4

Browse files
TrevorSchirmerTrevorSchirmer
authored
Merge pull request #15 from ApolloAutomation/H2
Added H-2
2 parents e90d412 + c9d23f3 commit 13eb2d4

File tree

14 files changed

+1029
-123
lines changed

14 files changed

+1029
-123
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!--
2+
From Core.yaml. Should match date YY.MM.DD.# ( Usually # is 1 )
3+
-->
4+
Version:
5+
6+
<!--
7+
You are amazing! Thanks for contributing to our project!
8+
Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
9+
-->
10+
## What does this implement/fix?
11+
12+
13+
14+
## Types of changes
15+
<!--
16+
What type of change does your PR introduce?
17+
NOTE: Please, check only 1! box!
18+
If your PR requires multiple boxes to be checked, you'll most likely need to
19+
split it into multiple PRs. This makes things easier and faster to code review.
20+
-->
21+
22+
- [ ] Bugfix (fixed change that fixes an issue)
23+
- [ ] New feature (thanks!)
24+
- [ ] Breaking change (repair/feature that breaks existing functionality)
25+
- [ ] Dependency Update - Does not publish
26+
- [ ] Other - Does not publish
27+
- [ ] Website of github readme file update - Does not publish
28+
- [ ] Github workflows - Does not publish
29+
30+
31+
## Checklist / Checklijst:
32+
<!--
33+
Put an x in the boxes that apply. You can also fill these out after
34+
creating the PR. If you're unsure about any of them, don't hesitate to ask.
35+
We're here to help! This is simply a reminder of what we are going to look
36+
for before merging your code.
37+
-->
38+
39+
- [ ] The code change has been tested and works locally
40+
- [ ] The code change has not yet been tested
41+
42+
If user-visible functionality or configuration variables are added/modified:
43+
- [ ] Added/updated documentation for the web page
44+
45+
<!--
46+
Thank you for contributing <3
47+
-->
48+
49+

‎.github/dependabot.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "github-actions"
9+
directory: "/"
10+
schedule:
11+
interval: "daily"
12+
commit-message:
13+
prefix: "chore(ci): "
14+
groups:
15+
github-actions:
16+
patterns:
17+
- "*"

‎.github/release-drafter.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name-template: 'Release v$NEXT_PATCH_VERSION'
2+
tag-template: "$RESOLVED_VERSION"
3+
change-template: "- #$NUMBER $TITLE @$AUTHOR"
4+
sort-direction: ascending
5+
6+
categories:
7+
- title: "🚨 Breaking changes"
8+
labels:
9+
- "breaking-change"
10+
- title: "✨ New features"
11+
labels:
12+
- "new-feature"
13+
- title: "🐛 Bug fixes"
14+
labels:
15+
- "bugfix"
16+
# - title: "🚀 Enhancements"
17+
# labels:
18+
# - "enhancement"
19+
# - "refactor"
20+
# - "performance"
21+
# - title: "🧰 Maintenance"
22+
# labels:
23+
# - "maintenance"
24+
# - "ci"
25+
# - title: "📚 Documentation"
26+
# labels:
27+
# - "documentation"
28+
- title: "⬆️ Dependency updates"
29+
collapse-after: 5
30+
labels:
31+
- "dependency-update"
32+
# - title: "🚨🚨 Security Fixes 🚨🚨"
33+
# labels:
34+
# - "security"
35+
36+
37+
include-labels:
38+
- "bugfix"
39+
- "new-feature"
40+
- "breaking-change"
41+
42+
no-changes-template: '- No changes'
43+
44+
template: |
45+
## What's Changed
46+
47+
$CHANGES
48+
49+
**Full Changelog**: https://github.com/ApolloAutomation/H-1/compare/$PREVIOUS_TAG...$RESOLVED_VERSION.1
50+
51+
Be sure to 🌟 this repository for updates!

‎.github/workflows/autoassign.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pull-requests: write
1313
steps:
1414
- name: 'Auto-assign issue'
15-
uses: pozil/auto-assign-issue@v1
15+
uses: pozil/auto-assign-issue@v2
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
assignees: TrevorSchirmer

‎.github/workflows/build.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Build and Publish
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
workflow_dispatch:
8+
inputs:
9+
bypass-yaml-check:
10+
description: 'Bypass YAML change check (force build/publish)'
11+
type: boolean
12+
required: false
13+
default: false
14+
# release:
15+
# types: [published]
16+
17+
jobs:
18+
build-and-publish:
19+
uses: ApolloAutomation/Workflows/.github/workflows/build.yml@main
20+
permissions:
21+
contents: write
22+
pages: write
23+
id-token: write
24+
pull-requests: write
25+
with:
26+
device-name: h-1
27+
yaml-files: |
28+
Integrations/ESPHome/H-1.yaml
29+
Integrations/ESPHome/H-2.yaml
30+
Integrations/ESPHome/H-1D.yaml
31+
Integrations/ESPHome/H-2D.yaml
32+
firmware-names: "1:firmware,2:firmware2,1D:firmare-d,2D:firmware-2d"
33+
core-yaml-path: Integrations/ESPHome/Core.yaml
34+
esphome-version: stable
35+
# Bypass check if manually triggered with bypass option
36+
check-yaml-changes: ${{ !(github.event_name == 'workflow_dispatch' && github.event.inputs.bypass-yaml-check == 'true') }}
37+
publish-to-pages: true
38+
has-installer: true
39+
installer-path: static

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,43 @@ name: CI
33
on:
44
pull_request:
55

6+
permissions:
7+
# Allow GITHUB_TOKEN to add labels to pull requests
8+
pull-requests: write
9+
issues: write
10+
contents: read
11+
id-token: write
12+
613
jobs:
14+
label-check:
15+
name: Label Check
16+
uses: ApolloAutomation/Workflows/.github/workflows/label-check.yml@main
17+
718
ci:
8-
name: Building ${{ matrix.file }}
19+
name: Building ${{ matrix.file }} / ESPHome ${{ matrix.esphome-version }} / ESPHome ${{ matrix.esphome-version }}
920
runs-on: ubuntu-latest
1021
strategy:
1122
matrix:
1223
file:
1324
- Integrations/ESPHome/H-1.yaml
25+
- Integrations/ESPHome/H-2.yaml
1426
- Integrations/ESPHome/H-1D.yaml
15-
- Integrations/ESPHome/H-1_Minimal.yaml
27+
- Integrations/ESPHome/H-2D.yaml
1628
esphome-version:
1729
- stable
1830
- beta
1931
- dev
2032
steps:
2133
- name: Checkout source code
22-
uses: actions/checkout@v4.1.7
34+
uses: actions/checkout@v4.2.2
2335
- name: Build ESPHome firmware to verify configuration
24-
uses: esphome/build-action@v3.1.0
36+
uses: esphome/build-action@v7
2537
with:
26-
yaml_file: ${{ matrix.file }}
38+
yaml-file: ${{ matrix.file }}
39+
40+
41+
42+
43+
44+
45+

‎.github/workflows/publish.yml‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎.github/workflows/weekly.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Weekly Firmware Build
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * 1'
6+
7+
jobs:
8+
build:
9+
name: Building ${{ matrix.file }} / ESPHome ${{ matrix.esphome-version }}
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
file:
14+
- Integrations/ESPHome/H-1.yaml
15+
- Integrations/ESPHome/H-2.yaml
16+
- Integrations/ESPHome/H-1D.yaml
17+
- Integrations/ESPHome/H-2D.yaml
18+
esphome-version:
19+
- stable
20+
- beta
21+
- dev
22+
steps:
23+
- name: Checkout source code
24+
uses: actions/[email protected]
25+
- name: Build ESPHome firmware to verify configuration
26+
uses: esphome/build-action@v7
27+
with:
28+
yaml-file: ${{ matrix.file }}

‎Apollo-H-2.JPG‎

2.6 MB
Loading

0 commit comments

Comments
 (0)