Update formplayer staging to track commcare-core master#3
Merged
dannyroberts merged 1 commit intomainfrom Mar 19, 2026
Merged
Conversation
The formplayer branch has been eliminated. The libs/commcare submodule now tracks master. Also removed merged branch entries: - dmr/add-getBulkIdsForIndex-to-SqlStorage (feature branch deleted) - masterToFormplayer2.60 (already merged into master)
Member
Author
|
I'm going to go ahead and merge this without waiting for approval, given our standard use of this repo. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
https://dimagi.atlassian.net/browse/SAAS-19426
Note: this PR affects only formplayer-staging.yml which we normally just push straight to master. However, I'm raising this as a PR for visibility, since it's embedding something that's conceptually more of a structural change (tracking master branch as trunk) rather than just changing what other branches we want on staging right now.
Summary
The commcare-core
formplayerbranch has been eliminated. This updatesformplayer-staging.ymlso thelibs/commcaresubmodule tracksmasterinstead of the now-deletedformplayerbranch.Changes
libs/commcaretrunk fromformplayertomasterdmr/add-getBulkIdsForIndex-to-SqlStorage(feature branch deleted from remote)masterToFormplayer2.60(already merged into commcare-core master)Context
This is part of the formplayer branch elimination effort. Both commcare-android and formplayer now consume commcare-core's
masterbranch directly. See commcare-core PR #1525 for the cross-repo CI setup.Test plan
./scripts/rebuildstagingin the formplayer repo succeeds with this config