Merge formplayer branch into master (tested with cross-repo CI)#1527
Merge formplayer branch into master (tested with cross-repo CI)#1527dannyroberts wants to merge 12 commits into
Conversation
Duplicate of credentialModel
Add reference field to FixtureInitializationException
Duplicate of pm_edit_contribute.md
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. 🗂️ Base branches to auto review (1)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
📝 Coding Plan
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. Comment |
|
The failing check |
Master to formplayer (2.61)
|
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. |



Technical Summary
Merges theformplayerbranch intodmr/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 tomasterto merge the formplayer branch content into mainline — a step toward eliminating theformplayerbranch 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 fromdmr/cross-repo-citomaster. 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
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
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