Skip to content

Merge beta into main #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TrevorSchirmer merged 5 commits into from
Jul 15, 2026
Merged

Merge beta into main #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
addfa24
Enable API encryption
bharvey88 Jul 14, 2026
09399b5
Remove duplicate label-check job from CI workflow
bharvey88 Jul 14, 2026
64b884b
Merge pull request #87 from bharvey88/fix/ci-drop-label-check
bharvey88 Jul 14, 2026
8fe7883
Merge branch 'beta' into fix/api-encryption
bharvey88 Jul 14, 2026
8e7ecc7
Merge pull request #86 from bharvey88/fix/api-encryption
bharvey88 Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ on:
pull_request:

permissions:
pull-requests: write
issues: write
contents: read

# Label check lives in label-check.yml on pull_request_target so it can
# label fork-submitted PRs; plain pull_request tokens are read-only there.
jobs:
label-check:
name: Label Check
uses: ApolloAutomation/Workflows/.github/workflows/label-check.yml@main

ci:
name: CI
uses: ApolloAutomation/Workflows/.github/workflows/esphome-ci.yml@main
Expand Down
3 changes: 2 additions & 1 deletion Integrations/ESPHome/Core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
substitutions:
name: apollo-msr-2
version: "26.7.12.1"
version: "26.7.14.1"
device_description: ${name} made by Apollo Automation - version ${version}.
# Default update channel on first boot (no stored user choice yet, i.e. a
# fresh flash). The beta-channel builds override this to "Beta" (see
Expand Down Expand Up @@ -104,6 +104,7 @@ globals:
# Enable Home Assistant API
# Also Add Buzzer Action Connection
api:
encryption:
actions:
- action: play_buzzer
variables:
Expand Down
Loading