diff --git a/data/ansible/rpm_packages/cgrates.spec.j2 b/data/ansible/rpm_packages/cgrates.spec.j2 index eeb7d0e0d..b9b6cd395 100644 --- a/data/ansible/rpm_packages/cgrates.spec.j2 +++ b/data/ansible/rpm_packages/cgrates.spec.j2 @@ -1,5 +1,5 @@ {{ ansible_managed | comment }} -%global version 0.10.2 +%global version 0.10.3~dev %define debug_package %{nil} %global _logdir /var/log/%name diff --git a/packages/debian/changelog b/packages/debian/changelog index b1b8a9d4f..d32c44515 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -1,3 +1,9 @@ +cgrates (0.10.3~dev) UNRELEASED; urgency=medium + + * Incremented version + + -- DanB Thu, 08 Oct 2020 16:23:58 +0300 + cgrates (0.10.2) UNRELEASED; urgency=medium * [SupplierS] Uniformize the logic in model_helpers.go diff --git a/utils/consts.go b/utils/consts.go index 90904fe29..faa881bb3 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -136,7 +136,7 @@ var ( const ( CGRateS = "CGRateS" - VERSION = "v0.10.2" + VERSION = "v0.10.3~dev" DIAMETER_FIRMWARE_REVISION = 918 REDIS_MAX_CONNS = 10 CGRATES = "cgrates" diff --git a/utils/coreutils_test.go b/utils/coreutils_test.go index c45ae12cf..d26ea9178 100644 --- a/utils/coreutils_test.go +++ b/utils/coreutils_test.go @@ -1111,7 +1111,8 @@ Date: Fri Dec 30 19:48:09 2016 +0100 Fixes for db driver to avoid returning new values in case of errors ` - eVers := "CGRateS@v0.10.2-20161230184809-73014daa0c1d" + version := "CGRateS@" + VERSION + eVers := version + "-20161230184809-73014daa0c1d" if vers, err := GetCGRVersion(); err != nil { t.Error(err) } else if vers != eVers { @@ -1120,35 +1121,35 @@ Date: Fri Dec 30 19:48:09 2016 +0100 GitLastLog = "" if vers, err := GetCGRVersion(); err != nil { t.Error(err) - } else if vers != "CGRateS@v0.10.2" { - t.Errorf("Expecting: , received: <%s>", vers) + } else if vers != version { + t.Errorf("Expecting: <%s>, received: <%s>", version, vers) } GitLastLog = "\n" if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - error: reading line from file" { t.Error(err) - } else if vers != "CGRateS@v0.10.2" { - t.Errorf("Expecting: , received: <%s>", vers) + } else if vers != version { + t.Errorf("Expecting: <%s>, received: <%s>", version, vers) } GitLastLog = `commit . . . ` if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - cannot extract commit hash" { t.Error(err) - } else if vers != "CGRateS@v0.10.2" { - t.Errorf("Expecting: , received: <%s>", vers) + } else if vers != version { + t.Errorf("Expecting: <%s>, received: <%s>", version, vers) } GitLastLog = `Date: : : ` if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - cannot split commit date" { t.Error(err) - } else if vers != "CGRateS@v0.10.2" { - t.Errorf("Expecting: , received: <%s>", vers) + } else if vers != version { + t.Errorf("Expecting: <%s>, received: <%s>", version, vers) } GitLastLog = `Date: wrong format ` if vers, err := GetCGRVersion(); err == nil || err.Error() != `Building version - error: compiling commit date` { t.Error(err) - } else if vers != "CGRateS@v0.10.2" { - t.Errorf("Expecting: , received: <%s>", vers) + } else if vers != version { + t.Errorf("Expecting: <%s>, received: <%s>", version, vers) } GitLastLog = `ommit 73014daa0c1d7edcb532d5fe600b8a20d588cdf8 Author: DanB @@ -1158,8 +1159,8 @@ Date: Fri Dec 30 19:48:09 2016 +0100 ` if vers, err := GetCGRVersion(); err == nil || err.Error() != "Cannot find commitHash or commitDate information" { t.Error(err) - } else if vers != "CGRateS@v0.10.2" { - t.Errorf("Expecting: , received: <%s>", vers) + } else if vers != version { + t.Errorf("Expecting: <%s>, received: <%s>", version, vers) } }