Skip to content

Point commcare-core submodule at master branch #1767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dannyroberts merged 2 commits into from
Mar 20, 2026
Merged

Point commcare-core submodule at master branch #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b3b24e
Point commcare-core submodule at master branch
dannyroberts Mar 19, 2026
dc45eee
Update README to reflect single-branch commcare-core workflow
dannyroberts Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "libs/commcare"]
path = libs/commcare
url = https://github.com/dimagi/commcare-core.git
branch = formplayer
branch = master
Copy link
Member Author

@dannyroberts dannyroberts Mar 19, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Looking at the diff on the libs/commcare change, it looks like the only additional PRs that were merged into master but weren't yet on the formplayer branch at the time that we deleted it were dimagi/commcare-core#1521 and dimagi/commcare-core#1516.

(There are a few other PRs, but they are all PRs that only touch GHA workflows under .github/ and docs/ and so categorically could not break formplayer by incorporating them.)

Copy link
Member Author

@dannyroberts dannyroberts Mar 19, 2026

Choose a reason for hiding this comment

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

Tests have of course been run against this, so that adds some level of assurance, but just wanted to raise in case anyone wants to advocate for more deeper testing/QA.

9 changes: 3 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,11 @@ For PRs that just modify code in the Formplayer repo, submit a PR to Formplayer

#### Contributing changes to commcare

Formplayer also has a dependency on the commcare-core repository. The commcare-core `master` branch is not
stable and Formplayer uses a different branch. The submodule repo `libs/commcare` should always be pointing to
the `formplayer` branch.
Formplayer depends on the commcare-core repository via the `libs/commcare` submodule, which tracks the `master` branch. Cross-repo CI automatically tests formplayer against commcare-core PRs, so no manual cross-testing is needed.

#### Updating the CommCare version
#### Updating the CommCare Version

When updating Formplayer to have a new release of a CommCare version (e.g. 2.34 to 2.35), a PR should be opened from the `commcare_X.Y` branch into
the `formplayer` branch. Once QA has been finished, merge the PR and update the Formplayer submodule.
When updating Formplayer to a new CommCare version (e.g. 2.34 to 2.35), open a PR from the `commcare_X.Y` branch into `master` on commcare-core. Once QA has finished, merge the PR and update the Formplayer submodule.

### IntelliJ Code Style Settings

Expand Down
2 changes: 1 addition & 1 deletion libs/commcare
Open in desktop
Submodule commcare updated 9 files
+89 −5 .github/workflows/build.yml
+46 −0 .github/workflows/release.yml
+57 −0 docs/cross-repo-ci.md
+42 −0 src/main/java/org/javarosa/core/model/ComboItem.java
+1 −1 src/main/java/org/javarosa/core/model/ComboboxFilterRule.java
+3 −3 src/main/java/org/javarosa/core/model/FuzzyMatchFilterRule.java
+3 −3 src/main/java/org/javarosa/core/model/MultiWordFilterRule.java
+5 −2 src/main/java/org/javarosa/core/model/StandardFilterRule.java
+8 −0 src/main/java/org/javarosa/xform/util/CalendarUtils.java
Loading