From 99b4bc5a622be86c597ce58e8a33c842de88195d Mon Sep 17 00:00:00 2001 From: Blerim Sheqa Date: Wed, 19 Jul 2017 12:55:37 +0200 Subject: [PATCH 1/3] Set all versions to master --- config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.yml b/config.yml index e7e1806..68acc02 100644 --- a/config.yml +++ b/config.yml @@ -3,26 +3,26 @@ projects_dir: 'projects' projects: Icinga 2: git: 'https://github.com/Icinga/icinga2.git' - ref: 'tags/v2.6.3' + ref: 'master' latest: true target: 'icinga2' docs_dir: 'doc' Icinga Web 2: git: 'https://github.com/Icinga/icingaweb2.git' - ref: 'tags/v2.4.1' + ref: 'master' latest: true target: 'icingaweb2' docs_dir: 'doc' Director: git: 'https://github.com/Icinga/icingaweb2-module-director.git' - ref: 'tags/v1.3.1' + ref: 'master' latest: true target: 'director' docs_dir: 'doc' category: 'Modules' Business Process: git: 'https://github.com/Icinga/icingaweb2-module-businessprocess.git' - ref: 'tags/v2.1.0' + ref: 'master' latest: true target: 'businessprocess' docs_dir: 'doc' From cd9415b43d44db7885422174a5ce8b209e7daa5f Mon Sep 17 00:00:00 2001 From: Blerim Sheqa Date: Wed, 19 Jul 2017 13:49:18 +0200 Subject: [PATCH 2/3] Remove 'latest' config parameter for snapshot builds --- config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config.yml b/config.yml index 68acc02..e840530 100644 --- a/config.yml +++ b/config.yml @@ -4,26 +4,22 @@ projects: Icinga 2: git: 'https://github.com/Icinga/icinga2.git' ref: 'master' - latest: true target: 'icinga2' docs_dir: 'doc' Icinga Web 2: git: 'https://github.com/Icinga/icingaweb2.git' ref: 'master' - latest: true target: 'icingaweb2' docs_dir: 'doc' Director: git: 'https://github.com/Icinga/icingaweb2-module-director.git' ref: 'master' - latest: true target: 'director' docs_dir: 'doc' category: 'Modules' Business Process: git: 'https://github.com/Icinga/icingaweb2-module-businessprocess.git' ref: 'master' - latest: true target: 'businessprocess' docs_dir: 'doc' category: 'Modules' From 5c02b510771d8a549433e5d0f9c4541039dcf568 Mon Sep 17 00:00:00 2001 From: Blerim Sheqa Date: Wed, 19 Jul 2017 13:49:39 +0200 Subject: [PATCH 3/3] Use '/snapshot' path if ref is master --- build-docs.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-docs.rb b/build-docs.rb index 36dfdf5..9736155 100755 --- a/build-docs.rb +++ b/build-docs.rb @@ -14,6 +14,8 @@ config['projects'].each do |project_name, project_config| if project_config['latest'] == true clone_target = project_dir + '/latest' + elsif project_config['ref'] == 'master' + clone_target = project_dir + '/snapshot' else clone_target = project_dir + '/' + project_config['ref'].gsub('tags/', '') end