CiviCRM Community Forums (archive)

*

News:

Have a question about CiviCRM?
Get it answered quickly at the new
CiviCRM Stack Exchange Q+A site

This forum was archived on 25 November 2017. Learn more.
How to get involved.
What to do if you think you've found a bug.



  • CiviCRM Community Forums (archive) »
  • Old sections (read-only, deprecated) »
  • Developer Discussion (Moderator: Donald Lobo) »
  • 4.5 branch created
Pages: [1]

Author Topic: 4.5 branch created  (Read 405 times)

totten

  • Administrator
  • Ask me questions
  • *****
  • Posts: 695
  • Karma: 64
4.5 branch created
August 25, 2014, 01:56:17 am
It's official -- the 4.5 branch has been split off from master. Some notes:

  • Any new fixes for v4.5.x should target the 4.5 branch. Any bigger features/refactorings/etc should target the master branch.
  • Any new or existing PR's for master are actually targeting the next major release after 4.5 (ie 4.6). If you have an open PR intended for 4.5, then please close it and open a new one. (If the PR is relatively recent/fresh, you can probably open a new PR using the same git-branch as before -- just use Github's website to open the new PR.)
  • When reviewing PR's, please be particularly diligent about checking that the PR targets the appropriate branch.
  • Subsequent builds of the sandbox sites (e.g. http://drupal.sandbox.civicrm.org/ ) should be based on the 4.5 branch (*not* master). When 4.5 goes stable, we'll need to update again.
  • The Jenkins jobs for testing have been extended to include 4.5. The jobs have also been rearranged to more easily support multiple versions. There's a little more detail about it in https://civicrm.org/blogs/totten/continuous-testing .

(Note: Some of the things which have changed are slow or execute only periodically. Consequently, it's hard thoroughly to test them in advance. I'll check-in on the jobs tomorrow. If you encounter any problems, let me know.)
« Last Edit: August 25, 2014, 02:03:36 am by totten »

mathieu

  • Administrator
  • Ask me questions
  • *****
  • Posts: 620
  • Karma: 36
    • Work
  • CiviCRM version: 4.7
  • CMS version: Drupal
  • MySQL version: MariaDB 10
  • PHP version: 7
Re: 4.5 branch created
August 25, 2014, 06:20:23 am
Great! Looking forward to 4.5 :)

I have pushed the new 4.5 strings to Transifex for translation. https://www.transifex.com/projects/p/civicrm/

For those curious, it's about 626 new strings that were added.

Usually we track the strings for the 3 latest branches of CiviCRM, so this release would have dropped support for 4.2-specific strings. Since there is still security support from the community, I have left the 4.2 strings in there for now (to be clear, Transifex now has strings for 4.2, 4.3, 4.4 and 4.5, so you can update your translations on all those versions using the same l10n/xx_XX/civicrm.mo).

edit: cross-posted to: http://forum.civicrm.org/index.php/topic,33957.0.html
« Last Edit: August 25, 2014, 06:50:53 am by mathieu »
CiviCamp Montréal, 29 septembre 2017 | Co-founder / consultant / turn-key CiviCRM hosting for Quebec/Canada @ SymbioTIC.coop

joanne

  • Administrator
  • Ask me questions
  • *****
  • Posts: 852
  • Karma: 83
  • CiviCRM version: 4.4.16
  • CMS version: Drupal 7
Re: 4.5 branch created
August 26, 2014, 05:44:53 am
What do you do if your changes are for 4.5 but also belong in Master?

Donald Lobo

  • Administrator
  • I’m (like) Lobo ;)
  • *****
  • Posts: 15963
  • Karma: 470
    • CiviCRM site
  • CiviCRM version: 4.2+
  • CMS version: Drupal 7, Joomla 2.5+
  • MySQL version: 5.5.x
  • PHP version: 5.4.x
Re: 4.5 branch created
August 26, 2014, 07:05:55 am

all 4.5 changes are automatically merged into master on a weekly basis, unless the commit comes with the comment:

Do not merge

lobo
A new CiviCRM Q&A resource needs YOUR help to get started. Visit our StackExchange proposed site, sign up and vote on 5 questions

Pages: [1]
  • CiviCRM Community Forums (archive) »
  • Old sections (read-only, deprecated) »
  • Developer Discussion (Moderator: Donald Lobo) »
  • 4.5 branch created

This forum was archived on 2017-11-26.