diff options
| author | Herman van Rink | 2017-11-30 18:46:46 (GMT) |
|---|---|---|
| committer | Herman van Rink | 2017-11-30 18:46:46 (GMT) |
| commit | 1852e6f2c286f161d8e2f61eca7602199d00f17c (patch) | |
| tree | 69af84c0e54259e61424917ddbb7bfa4befdf297 | |
| parent | 76ff44856c888b871df05c4e2244fb08772a77d8 (diff) | |
Revert "change version information for release 3.130"
This reverts commit 76ff44856c888b871df05c4e2244fb08772a77d8.
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | aegir-release.make | 2 | ||||
| -rw-r--r--[l---------] | aegir.make | 11 | ||||
| -rw-r--r-- | provision.info | 2 | ||||
| -rw-r--r-- | upgrade.sh.txt | 2 |
5 files changed, 15 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c115cde..9e2370d 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 503d390..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.130" +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 3741d70..6f01916 100644 --- a/provision.info +++ b/provision.info @@ -1,4 +1,4 @@ name=Provision description="Aegir backend" -version=7.x-3.130 +version=7.x-3.x diff --git a/upgrade.sh.txt b/upgrade.sh.txt index cb5fa5c..c325c3f 100644 --- a/upgrade.sh.txt +++ b/upgrade.sh.txt @@ -9,7 +9,7 @@ ######################################################################## # Basic variables, change before running. -AEGIR_VERSION="7.x-3.130" +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. |