summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-05-23 09:14:21 (GMT)
committerHerman van Rink2017-05-23 09:14:21 (GMT)
commit50c30f821f885fef8ccb67872c92807308a5a675 (patch)
tree6a7e5e673ef2e5c6f61c07c6300df834be3ad816
parent90021302e4638315233574ae8376e53466fd7987 (diff)
change version information for release 3.11-beta27.x-3.11-beta2
-rw-r--r--.gitlab-ci.yml4
l---------[-rw-r--r--]aegir.make11
-rw-r--r--debian/changelog7
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
5 files changed, 12 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e172b6c..0e9336f 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.make b/aegir.make
index d1357cc..f6e35b9 100644..120000
--- a/aegir.make
+++ b/aegir.make
@@ -1,10 +1 @@
-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"
-
+aegir-release.make \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 1f5b8ba..2694fe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+aegir3-provision (3.11~beta2) 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 <helmo@initfour.nl> Tue, 23 May 2017 11:13:35 +0200
+
aegir3-provision (3.11~beta1) unstable; urgency=medium
* Preparations for the 3.11 release, testing the GitLab build process.
diff --git a/provision.info b/provision.info
index 6f01916..eb86f3e 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-beta2
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index c325c3f..bd04bc7 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-beta2"
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.