Commit 6eb6e910 authored by Richard Mansfield's avatar Richard Mansfield

Don't increment version by date on stable branches (bug #988682)

parent ac789bf9
...@@ -75,6 +75,10 @@ if [ -z "${MAJOR}" ] || [ -z "${MINOR}" ]; then ...@@ -75,6 +75,10 @@ if [ -z "${MAJOR}" ] || [ -z "${MINOR}" ]; then
exit 1 exit 1
fi fi
if [ ! -z "${MICRO}" ] && [ "${BRANCH}" != 'master' ]; then
echo "* Micro version is ${MICRO} and this is a stable branch. Stuff may be wrong. *"
fi
mkdir -p ${BUILDDIR}/mahara mkdir -p ${BUILDDIR}/mahara
pushd ${BUILDDIR}/mahara pushd ${BUILDDIR}/mahara
...@@ -126,7 +130,7 @@ VERSIONFILE=htdocs/lib/version.php ...@@ -126,7 +130,7 @@ VERSIONFILE=htdocs/lib/version.php
# If there's no 'micro' part of the version number, assume it's a stable release, and # If there's no 'micro' part of the version number, assume it's a stable release, and
# bump version by 1. If it's an unstable release, use # bump version by 1. If it's an unstable release, use
if [ -z "${MICRO}" ]; then if [ -z "${MICRO}" ] || [ "${BRANCH}" != 'master' ]; then
OLDVERSION=$(perl -n -e 'print if s/^\$config->version = (\d{10}).*/$1/' < ${VERSIONFILE}) OLDVERSION=$(perl -n -e 'print if s/^\$config->version = (\d{10}).*/$1/' < ${VERSIONFILE})
NEWVERSION=$(( ${OLDVERSION} + 1 )) NEWVERSION=$(( ${OLDVERSION} + 1 ))
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment