Skip to content

Merge release/8.17 into main - #5663

Merged
sztomek merged 10 commits into
mainfrom
merge/release-8.17-into-main
Jul 28, 2026
Merged

Merge release/8.17 into main#5663
sztomek merged 10 commits into
mainfrom
merge/release-8.17-into-main

Conversation

@wpmobilebot

Copy link
Copy Markdown
Collaborator

Merging release/8.17 into main.

Via intermediate branch merge/release-8.17-into-main, to help fix conflicts if any:

                            release/8.17  ----o-- - - -
                                               \
            merge/release-8.17-into-main        `---.
                                                     \
                                    main  ------------x- - -

@wpmobilebot
wpmobilebot requested a review from a team as a code owner July 28, 2026 09:48
@wpmobilebot
wpmobilebot requested review from sztomek and removed request for a team July 28, 2026 09:48
@wpmobilebot wpmobilebot added this to the 8.18 milestone Jul 28, 2026
@dangermattic

Copy link
Copy Markdown
Collaborator
1 Message
📖 This PR has the releases label: some checks will be skipped.

Generated by 🚫 Danger

@claude

claude Bot commented Jul 28, 2026

Copy link
Copy Markdown

Claude finished @sztomek's task in 1m 22s —— View job


PR Review: Merge release/8.17 into main

  • Read PR diff and commits
  • Review CHANGELOG.md changes
  • Review version.properties changes
  • Post review feedback

This is a routine release-to-main merge-back. The only changes are CHANGELOG.md and version.properties, so there's no application code to assess for bugs, security, or performance. Feedback below focuses on the changelog content.

Findings

🟡 Duplicate changelog entry (needs attention)

In the 8.17 section, PR #5613"Resolve generated chapter seeks through on-demand audio fingerprinting" — is now listed twice:

  • under New Features (CHANGELOG.md:20-21)
  • under Updates (CHANGELOG.md:27-28)

This looks like a merge-conflict resolution artifact from bringing the release branch back into main. One copy should be removed. Since it's a follow-up refinement to existing fingerprinting work rather than a brand-new feature, keeping it under Updates and dropping the New Features copy is likely the more accurate categorization — but the release owner should confirm. I left an inline suggestion on the relevant lines.

Fix this →

version.properties

versionName 8.17-rc-18.17-rc-2 and versionCode 94429443 — a consistent, monotonic bump. The change also adds the previously-missing trailing newline at end of file. 👍

Summary

The merge is fine to proceed; the only real item is the duplicated #5613 changelog line. It's cosmetic (release-notes only) and won't affect the build, but worth tidying before this lands on main so the 8.18 notes stay clean.

Comment thread CHANGELOG.md
Comment thread CHANGELOG.md Outdated
@sztomek
sztomek force-pushed the merge/release-8.17-into-main branch from e4f82c9 to eb16399 Compare July 28, 2026 12:15
@claude

claude Bot commented Jul 28, 2026

Copy link
Copy Markdown

Claude finished @sztomek's task in 32s —— View job


PR Review: Merge release/8.17 into main

  • Read updated PR diff and commits
  • Verify the previously-flagged duplicate changelog entry
  • Review version.properties changes
  • Post review feedback

This is a routine release-to-main merge-back. Only CHANGELOG.md and version.properties changed — no application code to assess for bugs, security, or performance.

Findings

✅ Duplicate changelog entry is now resolved

The earlier concern — PR #5613 ("Resolve generated chapter seeks through on-demand audio fingerprinting") appearing twice in the 8.17 section — has been fixed by this branch update. It now appears exactly once, under Updates (CHANGELOG.md:25-26), which matches the categorization suggested in the earlier review. The 8.17 section reads cleanly:

version.properties

versionName 8.17-rc-18.17-rc-2 and versionCode 94429443 — consistent, monotonic bump, with the trailing newline at EOF now restored. 👍

Summary

The previously-flagged issue is resolved and no new concerns were found. The merge-back looks good to proceed. ✅

@sztomek
sztomek merged commit 57d836f into main Jul 28, 2026
18 checks passed
@sztomek
sztomek deleted the merge/release-8.17-into-main branch July 28, 2026 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants