Skip to content

chore: sync development to main#2654

Merged
maintainerr-automation[bot] merged 8 commits into
mainfrom
development
Apr 10, 2026
Merged

chore: sync development to main#2654
maintainerr-automation[bot] merged 8 commits into
mainfrom
development

Conversation

@maintainerr-automation

Copy link
Copy Markdown
Contributor

Summary

Promotes the current development branch state to main for release.

Notes

  • development is the source branch for ongoing work.
  • main is the stable release branch.
  • This PR should be squash-merged.
  • Create or update this PR with ./release.sh prepare-pr.
  • When the PR is approved, release automation continues automatically.
  • Approval triggers Release 2 - Queue Push PR To Main.
  • Release 2.5 - Execute Push PR To Main reloads the PR state, confirms the approving CODEOWNER still has an active approval, waits for non-release checks to finish, then continues the remaining release steps.
  • The remaining release steps are: squash-merge into main, sync back branches, and run Release 4 - Build Main.
  • If checks or branch protection still block the merge, release automation comments on this PR with the blocker.
  • If the flow succeeds, release automation posts a final summary comment with the merge, sync-back, and build results.
  • The manual release workflow starts only after the post-merge sync-back is complete.
  • Release 5 - Publish finishes with a second sync-back so the semantic-release commit on main is merged back into development.
  • Trigger the final release from main with REF=main ./release.sh release.

Test Plan

  • Run ./release.sh prepare-pr
  • Review the changed files and commit list in this PR
  • Approve this PR to trigger Release 2 - Queue Push PR To Main and Release 2.5 - Execute Push PR To Main
  • Confirm the PR was squash-merged into main, sync-back completed, and Release 4 - Build Main finished
  • Run REF=main ./release.sh release
  • Confirm Release 5 - Publish synced the release commit from main back into development

maintainerr-automation Bot and others added 8 commits April 10, 2026 05:12
Bumps [knip](https://github.com/webpro-nl/knip/tree/HEAD/packages/knip) from 6.1.1 to 6.3.1.
- [Release notes](https://github.com/webpro-nl/knip/releases)
- [Commits](https://github.com/webpro-nl/knip/commits/knip@6.3.1/packages/knip)

---
updated-dependencies:
- dependency-name: knip
  dependency-version: 6.3.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) from 5.96.2 to 5.97.0.
- [Release notes](https://github.com/TanStack/query/releases)
- [Changelog](https://github.com/TanStack/query/blob/main/packages/react-query/CHANGELOG.md)
- [Commits](https://github.com/TanStack/query/commits/@tanstack/react-query@5.97.0/packages/react-query)

---
updated-dependencies:
- dependency-name: "@tanstack/react-query"
  dependency-version: 5.97.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@tanstack/eslint-plugin-query](https://github.com/TanStack/query/tree/HEAD/packages/eslint-plugin-query) from 5.96.2 to 5.97.0.
- [Release notes](https://github.com/TanStack/query/releases)
- [Changelog](https://github.com/TanStack/query/blob/main/packages/eslint-plugin-query/CHANGELOG.md)
- [Commits](https://github.com/TanStack/query/commits/@tanstack/eslint-plugin-query@5.97.0/packages/eslint-plugin-query)

---
updated-dependencies:
- dependency-name: "@tanstack/eslint-plugin-query"
  dependency-version: 5.97.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Seasons and episodes in media servers carry their own provider IDs which
differ from the parent show. Image endpoints were using these
season-level IDs directly against TMDB/TVDB show endpoints, causing
wrong or missing images.

Pass the media server item ID through to the metadata service. When the
item is a season or episode, follow the parent relationship to the show
and use its provider IDs for image resolution. Falls back to the
original IDs on failure.

Closes #2649
@maintainerr-automation maintainerr-automation Bot added the release:docker-build Build release candidate Docker image label Apr 10, 2026

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved by release automation (CODEOWNER approval was verified by Release 2).

@maintainerr-automation maintainerr-automation Bot merged commit aec4198 into main Apr 10, 2026
24 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚀 Release 2.5 - Execute Push PR To Main completed after approval.

  • PR squash-merged into main
  • Sync back: success
  • Build Main: success

@enoch85 enoch85 added this to the 3.6.0 milestone Apr 11, 2026 — with GitHub Codespaces
@maintainerr-automation

Copy link
Copy Markdown
Contributor Author

🎉 This PR is included in version 3.6.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release:docker-build Build release candidate Docker image released

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant