summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-09-21 15:54:43 +0200
committerHerman van Rink2017-09-21 15:54:43 +0200
commit6fba9bcf0f0095719278fd7027b34b9e6b22bd3d (patch)
tree50b157752a9ccc99b25dbdef0db898b9c1274dbb
parentecfa44e17139f8090df69e6220ea79eaade3a741 (diff)
Revert "change version information for release 3.120"
This reverts commit ecfa44e17139f8090df69e6220ea79eaade3a741.
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--aegir-release.make2
-rw-r--r--[l---------]aegir.make11
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
5 files changed, 15 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eacfecd..f7267ba 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 e6bc587..d59e783 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.120"
+projects[hostmaster][download][tag] = "7.x-3.0-dev"
projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git"
diff --git a/aegir.make b/aegir.make
index f6e35b9..d1357cc 120000..100644
--- a/aegir.make
+++ b/aegir.make
@@ -1 +1,10 @@
-aegir-release.make \ No newline at end of file
+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/provision.info b/provision.info
index 59dafb2..6f01916 100644
--- a/provision.info
+++ b/provision.info
@@ -1,4 +1,4 @@
name=Provision
description="Aegir backend"
-version=7.x-3.120
+version=7.x-3.x
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 5524226..c325c3f 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -9,7 +9,7 @@
########################################################################
# Basic variables, change before running.
-AEGIR_VERSION="7.x-3.120"
+AEGIR_VERSION="7.x-3.x"
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.