Skip to content

Merge formplayer branch into master (tested with cross-repo CI)#1527

Closed
dannyroberts wants to merge 12 commits into
masterfrom
formplayer
Closed

Merge formplayer branch into master (tested with cross-repo CI)#1527
dannyroberts wants to merge 12 commits into
masterfrom
formplayer

Conversation

@dannyroberts

@dannyroberts dannyroberts commented Mar 18, 2026

Copy link
Copy Markdown
Member

Technical Summary

Merges the formplayer branch into dmr/cross-repo-ci (#1525) so that cross-repo CI can be tested against a codebase that is compatible with both downstream consumers.

Once cross-repo tests pass on this PR, the base will be changed to master to merge the formplayer branch content into mainline — a step toward eliminating the formplayer branch entirely.

This PR began based on dmr/cross-repo-ci (#1525) to so that cross-repo CI would be run on this PR. Once that passed, the PR had its base changed from dmr/cross-repo-ci to master. This is a step towards eliminating the formplayer branch entirely.

Safety Assurance

Safety story

This PR is a staging step for validating cross-repo CI. The formplayer branch is the existing production branch used by formplayer, so its content is already tested. (It has not yet been deployed since #1506 was merged.)

Automated test coverage

Cross-repo CI will validate that both commcare-android and formplayer can build against this codebase.

QA Plan

Wait for cross-repo CI status checks to pass, then change base to master. (Done.)

Special deploy instructions

  • This PR can be deployed after merge with no further considerations.

It's merging all of the formplayer branch into master, so while the commcare-android tests are passing against this (a prerequisite for rebasing on master and merging), I would still expect the master branch to go through QA before a release—but that's already the process. So I don't think anything special needs to happen after this is merged.

Rollback instructions

  • ❌ This PR can be reverted after deploy with no further considerations.

If we revert this PR, that will probably interact negatively with the cross-repo CI (once that's merged); I would expect formplayer tests to start failing again.

Review

  • The set of people pinged as reviewers is appropriate for the level of risk of the change.

@coderabbitai

coderabbitai Bot commented Mar 18, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

🗂️ Base branches to auto review (1)
  • commcare_*

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: bc90951d-0d4c-4d30-bde7-5129e746e010

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • ❌ 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • ❌ Create PR with unit tests
  • ❌ Commit unit tests in branch formplayer
📝 Coding Plan
  • ❌ Generate coding plan for human review comments

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 and usage tips.

@dannyroberts dannyroberts changed the title Merge formplayer branch into cross-repo CI base Merge formplayer branch into master (starting based against cross-repo CI branch) Mar 18, 2026
@dannyroberts
dannyroberts changed the base branch from dmr/cross-repo-ci to master March 18, 2026 14:30
@dannyroberts
dannyroberts changed the base branch from master to dmr/cross-repo-ci March 18, 2026 14:30
@dannyroberts dannyroberts reopened this Mar 18, 2026
@dannyroberts dannyroberts reopened this Mar 18, 2026
@dannyroberts

Copy link
Copy Markdown
Member Author

The failing check Screenshot 2026-03-18 at 11 12 49 AM
is due to this issue: dimagi/formplayer#1765. Will resolve that first.

@dannyroberts

dannyroberts commented Mar 19, 2026

Copy link
Copy Markdown
Member Author

Here is the CI results when based against the dmr/cross-repo-ci branch. (The one thing out of view of the current scroll window is task-list-completed, which is immaterial.)

Screenshot 2026-03-19 at 9 26 55 AM

I'm sharing here, because I'm about to re-base the PR to master, and these checks will disappear or become hidden, but these tests passing (more than them passing against master) is the major checkpoint/milestone in the safety story for this PR. (master doesn't have the cross-repo CI set up, so a pass there means much less.)

@dannyroberts
dannyroberts changed the base branch from dmr/cross-repo-ci to master March 19, 2026 14:30
@dannyroberts
dannyroberts marked this pull request as ready for review March 19, 2026 14:37
@dannyroberts dannyroberts changed the title Merge formplayer branch into master (starting based against cross-repo CI branch) Merge formplayer branch into master (tested with cross-repo CI) Mar 19, 2026
@dannyroberts

Copy link
Copy Markdown
Member Author

Actually, there's now no diff from master to formplayer it seems, so maybe this PR isn't actually blocking anything.

Screenshot 2026-03-19 at 9 45 48 AM

@dannyroberts

Copy link
Copy Markdown
Member Author

I think I'm just going to close this. No point merging "no changes" into master. This closed PR will serve as a record of the testing, should we want to come back to it.

@dannyroberts
dannyroberts deleted the formplayer branch March 19, 2026 18:29
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.

4 participants