diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e172b6c3f9641f924b21893555fca24d8dc3d8f6..0e9336f0d6300e555703128e5565da79e2721fb7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,8 +16,8 @@ build:deb: script: - export commit=$(git log -n 1 --oneline | sed 's/ .*$//') - export version=$(sed -ne 's/^[^(]*(\([^)]*\)).*/\1/;1p' debian/changelog) - - export new_version="${version}+${CI_BUILD_ID}.${commit}" - - dch -D unstable --newversion "$new_version" "automatic GitLab CI build ${CI_BUILD_ID}" + + - dpkg-buildpackage - mkdir build - mv -v ../aegir3*.deb build/ diff --git a/aegir-release.make b/aegir-release.make index b6999da54c86b247240ad4cd8541343bc16fba51..6da6dafe474994f60aa14fdd297f520e9cf3fa3d 100644 --- a/aegir-release.make +++ b/aegir-release.make @@ -5,6 +5,6 @@ api = 2 projects[drupal][type] = "core" ; The release.sh script updates the version of hostmaster. -projects[hostmaster][version] = "7.x-3.0-dev" +projects[hostmaster][version] = "3.11-beta1" projects[hostmaster][type] = "profile" projects[hostmaster][variant] = "projects" diff --git a/aegir.make b/aegir.make deleted file mode 100644 index d1357cc84ef36ce883a105d1a5d6da21cc190ab1..0000000000000000000000000000000000000000 --- a/aegir.make +++ /dev/null @@ -1,10 +0,0 @@ -core = 7.x -api = 2 - -projects[drupal][type] = "core" - -projects[hostmaster][type] = "profile" -projects[hostmaster][download][type] = "git" -projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git" -projects[hostmaster][download][branch] = "7.x-3.x" - diff --git a/aegir.make b/aegir.make new file mode 120000 index 0000000000000000000000000000000000000000..f6e35b975feae015d21a03f4812e212d0079b010 --- /dev/null +++ b/aegir.make @@ -0,0 +1 @@ +aegir-release.make \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 58c421240d368f6d5d8dd63f882065d67f56d08b..1f5b8ba6d6558e68cdf191d512dc6b9a64155fba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +aegir3-provision (3.11~beta1) unstable; urgency=medium + + * Preparations for the 3.11 release, testing the GitLab build process. + * Many bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.11 + + -- Herman van Rink Thu, 18 May 2017 14:28:24 +0200 + aegir3-provision (3.10) unstable; urgency=medium * Many bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.10 diff --git a/provision.info b/provision.info index 6f0191608fab3199092e85ac1c82308fcadba9a7..f7bdafa4f613292d0ca4fefa77075233624f55e3 100644 --- a/provision.info +++ b/provision.info @@ -1,4 +1,4 @@ name=Provision description="Aegir backend" -version=7.x-3.x +version=7.x-3.11-beta1 diff --git a/upgrade.sh.txt b/upgrade.sh.txt index c325c3f3b40dc75d0c56296040827970ce4d285f..f8d1f7c79317ac859ff3eddb9b98597b300c4799 100644 --- a/upgrade.sh.txt +++ b/upgrade.sh.txt @@ -9,7 +9,7 @@ ######################################################################## # Basic variables, change before running. -AEGIR_VERSION="7.x-3.x" +AEGIR_VERSION="7.x-3.11-beta1" NEW_DRUSH_VERSION="stable" # e.g stable, unstable, ignore or a version number like 8.1.3 # Extra variables, no changes needed for most use-cases.