Uploaded image for project: 'Moodle'
  1. Moodle
  2. MDL-70229

Minimum changes in code to continue working with parallel branches (3.11)

    XMLWordPrintable

    Details

    • Affected Branches:
      MOODLE_311_STABLE
    • Fixed Branches:
      MOODLE_311_STABLE
    • Pull 3.11 Branch:
      MDL-70229_311
    • Testing Instructions:
      Hide

      Not much to test, just:

      • While being integrated, verify that all the changes make sense and everything changed matches with the (311_STABLE) development branch.
      • Then all CI tests (both post-tests and phpunit/behat) will tell us if this is acceptable.
      Show
      Not much to test, just: While being integrated, verify that all the changes make sense and everything changed matches with the (311_STABLE) development branch. Then all CI tests (both post-tests and phpunit/behat) will tell us if this is acceptable.

      Description

      This is done as part of MDLSITE-6324.

      This issue include all the changes needed in core to continue working with parallel branches, aka. when a parallel development period is already in effect and we are creating a new XXX_STABLE (311 in this case) development branch.

      Note that the changes in this case are minimal, basically:

      • Update .travis.yml (or other CI configuration files) to meet the new 311_STABLE dev. branch.
      • Make backup release to match the new dev. branch.
      • Change main version.php version, release, branch and maturity to match the new dev. branch and diverge from previous one.

      Only in the new development branch, that's all!

      It's important to comment that this case is way simpler than the changes needed to start working with parallel branches (see MDL-69475). In that case, apart from the changes commented here, it's needed to, also, carefully plan to which number (in the future) all the master versions will be bumped to (avoiding any overlapping). See commits in that issue for more information.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              stronk7 Eloy Lafuente (stronk7)
              Reporter:
              stronk7 Eloy Lafuente (stronk7)
              Integrator:
              Eloy Lafuente (stronk7) Eloy Lafuente (stronk7)
              Tester:
              CiBoT CiBoT
              Participants:
              Component watchers:
              Adrian Greeve, Jake Dallimore, Mathew May, Mihail Geshoski, Peter Dias, Sujith Haridasan, Matteo Scaramuccia, Andrew Lyons, Dongsheng Cai, Huong Nguyen, Jun Pataleta, Michael Hawkins, Shamim Rezaie, Simey Lameze
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved:
                Fix Release Date:
                17/May/21

                  Time Tracking

                  Estimated:
                  Original Estimate - 0 minutes
                  0m
                  Remaining:
                  Remaining Estimate - 0 minutes
                  0m
                  Logged:
                  Time Spent - 1 hour, 36 minutes
                  1h 36m