moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-70229 install: Changes to continue working with parallel branches

Browse source 
- Main version (version, release, branch and maturity), guaranteeing
  we are diverging from previous stable branch and won't overlap any more.
- Backup release, to match new branch.
- CI configuration files (.travis.yml in this case), to match new branch.

For changes needed to START working with parallel branches, see MDL-69475
This commit is contained in:
Eloy Lafuente (stronk7) 2020-11-14 16:56:37 +01:00
parent f86b5e3545
commit adb8fe4c42
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -213,7 +213,7 @@ before_script:
# We need the official upstream for comparison # We need the official upstream for comparison
git remote add upstream https://github.com/moodle/moodle.git; git remote add upstream https://github.com/moodle/moodle.git;
git fetch upstream MOODLE_310_STABLE; git fetch upstream MOODLE_311_STABLE;
export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`"; export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
export GIT_COMMIT="$TRAVIS_COMMIT"; export GIT_COMMIT="$TRAVIS_COMMIT";
export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD` export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`

2
backup/backup.class.php
View file

@ -160,7 +160,7 @@ abstract class backup implements checksumable {
/** /**
* Usually same than major release zero version, mainly for informative/historic purposes. * Usually same than major release zero version, mainly for informative/historic purposes.
*/ */
const RELEASE = '3.10'; const RELEASE = '3.11';
/** /**
* Cipher to be used in backup and restore operations. * Cipher to be used in backup and restore operations.

8
version.php
View file

@ -29,9 +29,9 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2020110900.01; // 20201109 = branching date YYYYMMDD - do not modify! $version = 2020111400.01; // 20201109 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches. // RR = release increments - 00 in DEV branches.
// .XX = incremental changes. // .XX = incremental changes.
$release = '3.10+ (Build: 20201113)';// Human-friendly version name $release = '3.11dev (Build: 20201113)';// Human-friendly version name
$branch = '310'; // This version's branch. $branch = '311'; // This version's branch.
$maturity = MATURITY_STABLE; // This version's maturity level. $maturity = MATURITY_ALPHA; // This version's maturity level.