summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2018-05-02 09:45:58 (GMT)
committerHerman van Rink2018-05-02 09:45:58 (GMT)
commita151d3e6d2470fb2719069e6531b8814e67b46f9 (patch)
tree518db6f3a3ba11e7f9e08297c2edcf0918a123b7
parent77d36016a7d05626f1e96ce38a09ec324b09f7ed (diff)
change version information for release 3.1507.x-3.150
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--aegir-release.make2
l---------[-rw-r--r--]aegir.make11
-rw-r--r--debian/changelog6
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
6 files changed, 12 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a405058..30ed34b 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 d59e783..86d4e0b 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.150"
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 3e1d801..84dd266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+aegir3-provision (3.150) unstable; urgency=medium
+
+ * Bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.15
+
+ -- Herman van Rink <helmo@initfour.nl> Wed, 02 May 2018 11:45:22 +0200
+
aegir3-provision (3.146) testing; urgency=high
* Dummy release to include Drupal 7.59, see https://www.drupal.org/project/drupal/releases/7.59
diff --git a/provision.info b/provision.info
index 6f01916..737d523 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.150
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index c325c3f..4ed120d 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.150"
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.