diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e2370d0dc2749adc2785cdb3f74b1b86a0cc30f..c115cde7aa27fc68836425f4a233070492516c32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,8 +42,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 d59e783ccc6726c23c47a7ad8c0ef53b9d84e6a4..e3587534524f9ab2a682075f0ce4e0958bd6c78c 100644 --- a/aegir-release.make +++ b/aegir-release.make @@ -7,5 +7,5 @@ projects[drupal][type] = "core" ; The release.sh script updates the version of hostmaster. projects[hostmaster][type] = "profile" projects[hostmaster][download][type] = "git" -projects[hostmaster][download][tag] = "7.x-3.0-dev" +projects[hostmaster][download][tag] = "7.x-3.140" projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git" 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 0ef05ebf01146ea27a59eb5ae6bce9efc0a7c7e5..1ca461978ebfa9ff36f2808e6b05d279f619b7d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +aegir3-provision (3.140) unstable; urgency=medium + + * Bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.14 + + -- Herman van Rink Mon, 05 Feb 2018 13:39:54 +0100 + aegir3-provision (3.130) unstable; urgency=medium * Bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.13 diff --git a/provision.info b/provision.info index 6f0191608fab3199092e85ac1c82308fcadba9a7..51e32003b1c042da6632398c230d4e38d380cf3f 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.140 diff --git a/upgrade.sh.txt b/upgrade.sh.txt index c325c3f3b40dc75d0c56296040827970ce4d285f..f4263c958823d998844913b2d4d4343165336f9d 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.140" 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.