Skip to content

Commit

Permalink
Issue #2698027 by helmo: Minor release to update core?
Browse files Browse the repository at this point in the history
  • Loading branch information
helmo committed Dec 15, 2016
1 parent 1b868b2 commit cd2a75c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
9 changes: 6 additions & 3 deletions aegir-release.make
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
core = 7.x
api = 2

; this makefile fetches the latest release from Drupal.org
; it is maintained through the release.sh script
projects[hostmaster][type] = "core"
; This makefile fetches the latest release of Drupal from Drupal.org.
projects[drupal][type] = "core"

; The release.sh script updates the version of hostmaster.
projects[hostmaster][version] = "7.x-3.0-dev"
projects[hostmaster][type] = "profile"
projects[hostmaster][variant] = "projects"
13 changes: 12 additions & 1 deletion release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dch -v $debversion -D unstable
git add debian/changelog

echo changing hostmaster version in aegir-release.make
sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$major-$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp

echo enabling release makefilexs
ln -sf aegir-release.make aegir.make && git add aegir.make
Expand Down Expand Up @@ -125,9 +125,20 @@ mkdir -p build-area;
rm -rf build-area/hostmaster
git clone --branch $CURRENT_BRANCH `git config remote.origin.url | sed 's/provision/hostmaster/'` build-area/hostmaster

cd build-area/hostmaster
echo changing hostmaster.make versions
ln -sf drupal-org.make hostmaster.make && git add hostmaster.make
cd -

git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git commit -m"change version information for release $version"

echo "Setting the tag $NEW_TAG in a clean hostmaster clone."
git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git tag -a $NEW_TAG -m 'Add a new release tag.'

echo reverting tree to HEAD versions
git revert HEAD^


# Hosting
rm -rf build-area/hosting
git clone --branch $CURRENT_BRANCH `git config remote.origin.url | sed 's/provision/hosting/'` build-area/hosting
Expand Down

0 comments on commit cd2a75c

Please sign in to comment.