Skip to content

Commit

Permalink
get_version should return release version only if all submodules are …
Browse files Browse the repository at this point in the history
…tagged

otherwise we would build releases until there is a commit in the naemon repository
itself which could take a while because the main action is in core and thruk.

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
  • Loading branch information
sni committed Feb 22, 2014
1 parent 5a6df64 commit ba8e5a9
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
20 changes: 14 additions & 6 deletions get_version
Expand Up @@ -5,12 +5,20 @@ if [ ! -d .git ]; then
exit 1
fi

# find an exact match, if found use it as version as we are currently
# exactly on one tag
version=`git describe --tag --exact-match 2>/dev/null`
if [ $? -eq 0 ]; then
echo $version | tr -d 'v'
exit 0
# get tags of submodules
version_tg=`cd thruk/gui && git describe --tag --exact-match 2>/dev/null; cd ..`
version_tl=`cd thruk/libs && git describe --tag --exact-match 2>/dev/null; cd ..`
version_nc=`cd naemon-core && git describe --tag --exact-match 2>/dev/null; cd ..`
version_nl=`cd naemon-livestatus && git describe --tag --exact-match 2>/dev/null; cd ..`

if [ "$version_tg" != "" -a "$version_tl" != "" -a "$version_nc" != "" -a "$version_nl" != "" ]; then
# find an exact match, if found use it as version as we are currently
# exactly on one tag
version=`git describe --tag --exact-match 2>/dev/null`
if [ $? -eq 0 ]; then
echo $version | tr -d 'v'
exit 0
fi
fi

# if we are not on a exact tag, use the last tag and add the date
Expand Down
2 changes: 1 addition & 1 deletion thruk/gui
Submodule gui updated 41 files
+6 −0 Changes
+8 −7 MANIFEST
+32 −29 configure
+6 −0 debian/changelog
+1 −1 docs/thruk.3
+6 −6 lib/Thruk/Backend/Peer.pm
+2 −2 lib/Thruk/Backend/Pool.pm
+5 −3 lib/Thruk/Backend/Provider/HTTP.pm
+2 −2 lib/Thruk/Config.pm
+8 −1 lib/Thruk/Controller/status.pm
+2 −1 lib/Thruk/Utils.pm
+12 −3 lib/Thruk/Utils/External.pm
+15 −4 lib/Thruk/Utils/Status.pm
+12 −2 plugins/plugins-available/panorama/templates/_panorama_js_functions.tt
+16 −9 plugins/plugins-available/panorama/templates/_panorama_js_panlet_url.tt
+21 −1 plugins/plugins-available/reports2/lib/Thruk/Controller/reports2.pm
+7 −1 plugins/plugins-available/reports2/root/reports.js
+27 −1 plugins/plugins-available/reports2/root/reports_render.js
+6 −0 plugins/plugins-available/reports2/t/reports_cli.t
+3 −1 plugins/plugins-available/reports2/templates/reports/comp/report.tt
+13 −0 plugins/plugins-available/reports2/templates/reports/style/css.tt
+17 −0 root/thruk/javascript/thruk-1.82.js
+5 −1 root/thruk/startup.html
+1 −0 script/append.make
+1 −1 script/nagexp
+1 −1 script/nagimp
+1 −1 script/naglint
+1 −1 script/thruk
+0 −0 support/0007-fcgish.patch
+0 −0 support/0030-naemon.patch
+0 −0 support/0031-naemon-init.patch
+0 −0 support/0032-naemon-httpd.patch
+0 −0 support/0034-naemon-branding.patch
+0 −0 support/0035-naemon-cgicfg.patch
+0 −0 support/0036-naemon-htpasswd.patch
+1 −1 support/thruk.spec
+5 −5 t/089-patches.t
+4 −1 t/300-controller_status.t
+53 −0 templates/_progressbar.tt
+1 −53 templates/waiting_for_job.tt
+3 −0 themes/themes-available/Classic/stylesheets/thruk_global.css

0 comments on commit ba8e5a9

Please sign in to comment.