Commit b81a6460 authored by anarcat's avatar anarcat

revert last changes to release process

we are keeping the old method of installing from git, which means we
will install post-alpha2 code when there are commits to the frontend,
but meh - we currently can't install alpha2 at all from git, so that's
better.

we at least need to download the hostmaster profile in aegir.make, but
then that means it will recurse into hostmaster.make, so it means we
need to fiddle with *that* code if we want have sticky branches there.

the other alternative is to build from the distribution, but that's
not supported by Drush make, only by pm-download.
parent 09a5157b
......@@ -3,4 +3,7 @@ api = 2
projects[drupal][type] = "core"
includes[hostmaster] = "http://drupalcode.org/project/hostmaster.git/blob_plain/6.x-2.x:/hostmaster.make"
projects[hostmaster][type] = "profile"
projects[hostmaster][download][type] = "git"
projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git"
projects[hostmaster][download][branch] = "6.x-2.x"
......@@ -50,21 +50,17 @@ cat <<EOF
The following operations will be done:
0. prompt you for a debian/changelog entry
1. change the makefile to download the stable release
1. change the makefile to download tarball
2. change the upgrade.sh.txt version
3. display the resulting diff
4. commit those changes to git
5. lay down the tag
6. revert the commit
7. change the version numbers in the hostmaster makefile
8. lay down the tag in hostmaster
9. lay down the tags in eldir and hosting
7. (optionally) push those changes
Don't forget that as long as changes are not pushed upstream, this can
all be reverted (see git-reset(1) and git-revert(1)).
YOU WILL NEED TO PUSH CHANGES TO provision, hostmaster, hosting and
eldir ONCE THIS SCRIPT IS DONE.
The operation can be aborted before step 7. Don't forget that as
long as changes are not pushed upstream, this can all be reverted (see
git-reset(1) and git-revert(1) ).
EOF
......@@ -74,13 +70,14 @@ fi
git pull --rebase
debversion=$(echo $version | sed -e 's/-/~/')
dch -v $debversion -D unstable
dch -v $version -D testing
git add debian/changelog
echo changing makefile to download tarball
sed -i'.tmp' -e"/^includes\[hostmaster\].*/s# *= .*\$# = \"http://drupalcode.org/project/hostmaster.git/blob_plain/$major-$version:/drupal-org.make\"#" aegir.make
git add aegir.make && rm aegir.make.tmp
#sed -i'.tmp' -e'/^projects\[hostmaster\]\[download\]\[type\]/s/=.*$/ = "get"/' \
# -e'/^projects\[hostmaster\]\[download\]\[url\]/s#=.*$#= "http://ftp.drupal.org/files/projects/hostmaster-'$major-$version'.tgz"#' \
# -e'/^projects\[hostmaster\]\[download\]\[branch\].*/s/\[branch\] *=.*$/[directory_name] = "hostmaster"/' aegir.make && git add aegir.make && rm aegir.make.tmp
sed -i'.tmp' -e'/^projects\[hostmaster\]\[download\]\[branch\].*/s/\[branch\] *=.*$/[tag] = "'$major-$version'"/' aegir.make && git add aegir.make && rm aegir.make.tmp
echo changing provision.info version
sed -i'.tmp' -e"s/version *=.*$/version=$major-$version/" provision.info
......@@ -112,24 +109,7 @@ git reset --quiet HEAD 'debian/changelog'
git checkout -- 'debian/changelog'
git commit
echo checking out slave modules
for module in hostmaster hosting eldir; do
if [ ! -d ../$module ]; then
git clone git.drupal.org:project/$module ../$module
fi
( cd ../$module ; git pull --rebase )
done
echo "changing version numbers in hostmaster makefile"
(
cd ../hostmaster
sed -i.tmp -e "/^projects\[\(eldir\|hosting\)\]\[version\]/s/ *=.*\$/ = \"$version\"/" drupal-org.make
git add drupal-org.make && rm drupal-org.make.tmp
git diff --cached
git commit -m"bump to release $version"
)
for module in hostmaster hosting eldir; do
echo tagging $module
sed -n '1,/ --/p' debian/changelog | ( cd ../$module && git tag -a -F - $major-$version )
done
if prompt_yes_no "push tags and commits upstream? "; then
# this makes sure we push the commit *and* the tag
git push --tags origin HEAD
fi
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