Skip to content

Sync main into beta; converge CI on shared reusable workflows#98

Merged
bharvey88 merged 12 commits into
betafrom
sync-main-into-beta
Jul 9, 2026
Merged

Sync main into beta; converge CI on shared reusable workflows#98
bharvey88 merged 12 commits into
betafrom
sync-main-into-beta

Conversation

@bharvey88

Copy link
Copy Markdown
Contributor

Version: 26.7.9.1 (no change — CI/workflow only)

What does this implement/fix?

Syncs main into beta so the beta -> main release PR (#97) merges cleanly. The only real conflicts were the CI workflow files, resolved by converging on the shared ApolloAutomation/Workflows reusable workflows (per Trevor) while keeping the fork-PR support added on beta:

  • autoassign.yml — thin caller of the shared autoassign.yml@main, triggered on pull_request_target so fork PRs get auto-assigned (removed the fork-skip if: guard, no longer needed with the write token).
  • ci.yml — thin caller of the shared esphome-ci.yml@main (its default stable/beta/dev matrix reproduces beta's old inline 9-build matrix). Label-check removed from here.
  • label-check.yml — kept as its own thin caller on pull_request_target (build and label-check need different triggers, so they can't share one file).

Also pulls in main's dependabot.yml update and drops the duplicate root PULL_REQUEST_TEMPLATE.md.

No firmware code or version change — does not publish.

Types of changes

  • Bugfix (fixed change that fixes an issue)
  • New feature (thanks!)
  • Breaking change (repair/feature that breaks existing functionality)
  • Dependency Update - Does not publish
  • Other - Does not publish
  • Website of github readme file update - Does not publish
  • Github workflows - Does not publish

Checklist / Checklijst:

  • The code change has been tested and works locally
  • The code change has not yet been tested

If user-visible functionality or configuration variables are added/modified:

  • Added/updated documentation for the web page

🤖 Generated with Claude Code

TrevorSchirmer and others added 12 commits April 19, 2026 12:43
Release 26.3.2.1 - New sensors, ESPHome modernisation, and bug fixes
Bumps the github-actions group with 1 update: [pozil/auto-assign-issue](https://github.com/pozil/auto-assign-issue).


Updates `pozil/auto-assign-issue` from 2 to 3
- [Release notes](https://github.com/pozil/auto-assign-issue/releases)
- [Commits](pozil/auto-assign-issue@v2...v3)

---
updated-dependencies:
- dependency-name: pozil/auto-assign-issue
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/github-actions-3fa3f09d17

chore(ci): bump pozil/auto-assign-issue from 2 to 3 in the github-actions group
Bumps the github-actions group with 2 updates: [pozil/auto-assign-issue](https://github.com/pozil/auto-assign-issue) and [actions/checkout](https://github.com/actions/checkout).


Updates `pozil/auto-assign-issue` from 3 to 4
- [Release notes](https://github.com/pozil/auto-assign-issue/releases)
- [Commits](pozil/auto-assign-issue@v3...v4)

Updates `actions/checkout` from 6.0.2 to 6.0.3
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6.0.2...v6.0.3)

---
updated-dependencies:
- dependency-name: pozil/auto-assign-issue
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/checkout
  dependency-version: 6.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/github-actions-346f710312

chore(ci): bump the github-actions group with 2 updates
Bumps the github-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 6.0.3 to 7.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6.0.3...v7.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/github-actions-2217aebe03

chore(ci): bump actions/checkout from 6.0.3 to 7.0.0 in the github-actions group
Replaces inline version-pinned actions with thin callers of
ApolloAutomation/Workflows reusable workflows referenced @main. Leaf
repo now contains zero dependabot-bumpable refs; action version pins
are centralized in the Workflows repo. Dependabot schedule relaxed to
monthly as a safety net.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Consolidate workflows into shared ApolloAutomation/Workflows reusable workflows
Resolves the autoassign.yml and ci.yml conflicts by adopting the shared
ApolloAutomation/Workflows reusable workflows while keeping fork-PR support:

- autoassign.yml: thin caller of the shared autoassign workflow, triggered
  on pull_request_target so fork PRs get assigned (fork-skip guard removed).
- ci.yml: thin caller of the shared esphome-ci workflow (default
  stable/beta/dev matrix); label-check stays in its own pull_request_target
  caller (label-check.yml), since build and label-check need different
  triggers.

Also brings in main's dependabot config and drops the duplicate root
PULL_REQUEST_TEMPLATE.md.

🤖 Generated with [Claude Code](https://claude.com/claude-code)
@coderabbitai

coderabbitai Bot commented Jul 9, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@bharvey88, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 22 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: f597ddd5-d127-4437-870c-25589be3556a

📥 Commits

Reviewing files that changed from the base of the PR and between adf9bd8 and c686c79.

📒 Files selected for processing (4)
  • .github/dependabot.yml
  • .github/workflows/autoassign.yml
  • .github/workflows/ci.yml
  • PULL_REQUEST_TEMPLATE.md
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch sync-main-into-beta

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@bharvey88 bharvey88 merged commit 2581189 into beta Jul 9, 2026
9 of 11 checks passed
@bharvey88 bharvey88 deleted the sync-main-into-beta branch July 9, 2026 16:30
@bharvey88 bharvey88 mentioned this pull request Jul 9, 2026
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants