summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-09-21 13:54:43 (GMT)
committerHerman van Rink2017-09-21 13:54:43 (GMT)
commitecfa44e17139f8090df69e6220ea79eaade3a741 (patch)
treec18f34a43a1feb620c64d1272be82254188540e1
parente669ac7707db01e7828d8f83708f86fdb547b7db (diff)
change version information for release 3.1207.x-3.120
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--aegir-release.make2
l---------[-rw-r--r--]aegir.make11
-rw-r--r--debian/changelog7
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
6 files changed, 13 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7267ba..eacfecd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,8 +26,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 d59e783..e6bc587 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.120"
projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git"
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 16afda0..1c5c9d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+aegir3-provision (3.120) unstable; urgency=medium
+
+ * Many bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.12
+ * Going for semi-semantic-verioning ... https://www.drupal.org/node/2168955
+
+ -- Herman van Rink <helmo@initfour.nl> Thu, 21 Sep 2017 15:53:50 +0200
+
aegir3-provision (3.11.2) testing; urgency=medium
* Version bump to get the Drupal core security update. 3.11.1 got stuck in our packaging system.
diff --git a/provision.info b/provision.info
index 6f01916..59dafb2 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.120
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index c325c3f..5524226 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.120"
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.