Check in Riverlea extension with history from v0.7

[ufundo]

Overview

Demo for #31389 (comment)

Before

• Riverlea is packaged into the tarball at distribution
• It's not included if you install with composer

After

• It's checked into the main repo

Technical Details

Created using

# from civicrm-core repo
git remote add riverlea-ext https://lab.civicrm.org/extensions/riverlea.git
git checkout riverlea-ext/main
git checkout -b riverlea-check-in
git filter-branch --tree-filter "mkdir -p ext/riverlea; git mv -k * ext/riverlea" HEAD`
git rebase master

The rebase requires some manual intervention - e.g. on .gitignore, and because some of the riverlea branch history isn't totally linear.

End product can be verified with

rm -rf ext/riverlea
git clone https://lab.civicrm.org/extensions/riverlea.git ext/riverlea
rm -rf ext/riverlea/.git
git diff

Comments

This is currently missing the last few commits for 5.80.3 in the external repo.

Would prob be good to squash some of the earlier history?

[civibot]

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...

• If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
• A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
• A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
• If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
• Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
• A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
• To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
• For more information about contributing, see CONTRIBUTING.md.

Quick links for reviewers...

• ➡️ PR Demo site (can be rebuilt with the command test this please).
• 📖 Review standards
• 🗒️ Review template (brief or verbose)

➡️ Online demo of this PR 🔗

[ufundo]

cc @vingle

[vingle]

Would prob be good to squash some of the earlier history?

For sure - there will always be the original extension to check if needed. Happy to take your lead, otherwise around v0.7 would go back before Settings Screen & Dark Mode was added, but after Hamburg.

I'll shrink RiverLea's .gitignore a little. This PR doesn't update the dist scripts yet right - that would be another PR?

[eileenmcnaughton]

@ufundo - against 5.80 no?

[eileenmcnaughton]

Re the earlier commits - yeah - nice to squash but if it's not trivial to do I would possibly not bother?

[ufundo]

I'll shrink RiverLea's .gitignore a little.

I actually think maybe nothing in there is need

This PR doesn't update the dist scripts yet right - that would be another PR?

That should be added to this PR, otherwise it crashes all the tests as seen above

against 5.80 no?

Was that the plan - if so can rebase

nice to squash but if it's not trivial to do I would possibly not bother?

Easy to do up to a certain point. If @vingle you are happy with 0.7 I can do that 👍

Update coming shortly, with riverlea v5.80.3, onto 5.80 branch

[eileenmcnaughton]

thanks @ufundo - we also need to reverse the distmaker from 5.80

[ufundo]

Now with prefixed commit messages 😀

[ufundo]

We also need to reverse the distmaker from 5.80

Included that also

[ufundo]

Seems to be working on the test site

[eileenmcnaughton]

I've seen those fails before - but I didn't solve them - (I hit them trying to add test coverage & abandoned the attempt)

CRM_Contact_Page_View_UserDashBoardTest::testDashboardContentEmptyContact
Exception: CRM_Extension_Exception_MissingException: "Failed to find extension: civi_mail"
#0 /home/homer/buildkit/build/build-4/web/sites/all/modules/civicrm/CRM/Extension/Container/Basic.php(143): CRM_Extension_Container_Basic->getRelPath("civi_mail")
#1 /home/homer/buildkit/build/build-4/web/sites/all/modules/civicrm/CRM/Extension/Mapper.php(233): CRM_Extension_Container_Basic->getPath("civi_mail")
#2 /home/homer/buildkit/build/build-4/web/sites/all/modules/civicrm/CRM/Core/Resources.php(261): CRM_Extension_Mapper->keyToBasePath("civi_mail")

[ufundo]

Oof I am bad at remembering to lint pre MR, but that is a new personal record for style fails.

Weird about the other test. Will investigate tomorrow