diff --git a/analyzer/codechecker_analyzer/analyzer_context.py b/analyzer/codechecker_analyzer/analyzer_context.py index 993c4036c5..e62c5db65f 100644 --- a/analyzer/codechecker_analyzer/analyzer_context.py +++ b/analyzer/codechecker_analyzer/analyzer_context.py @@ -130,7 +130,8 @@ def __set_version(self): self.__package_version = package_version['major'] + '.' + \ package_version['minor'] + '.' + \ - package_version['revision'] + package_version['revision'] + \ + ('-rc' + package_version['rc'] if 'rc' in package_version else '') self.__package_build_date = package_build_date self.__package_git_hash = package_git_hash diff --git a/analyzer/config/analyzer_version.json b/analyzer/config/analyzer_version.json index c59ae6909f..92a2afbff7 100644 --- a/analyzer/config/analyzer_version.json +++ b/analyzer/config/analyzer_version.json @@ -2,6 +2,7 @@ "version": { "major" : "6", "minor" : "20", - "revision" : "0" + "revision" : "0", + "rc" : "1" } } diff --git a/scripts/build/extend_version_file.py b/scripts/build/extend_version_file.py index ad9fb5c5a1..9a2e06e682 100755 --- a/scripts/build/extend_version_file.py +++ b/scripts/build/extend_version_file.py @@ -37,6 +37,8 @@ def extend_with_git_information(repository_root, version_json_data): version_string += ".{0}".format(version['minor']) if int(version['revision']) != 0: version_string += ".{0}".format(version['revision']) + if int(version['rc']) != 0: + version_string += "-rc{0}".format(version['rc']) LOG.info("This is CodeChecker v%s", version_string) diff --git a/setup.py b/setup.py index 12187579b3..c5cf4c9463 100644 --- a/setup.py +++ b/setup.py @@ -141,7 +141,7 @@ def run(self): setuptools.setup( name="codechecker", - version="6.20.0", + version="6.20.0-rc1", author='CodeChecker Team (Ericsson)', author_email='csordasmarton92@gmail.com', description="CodeChecker is an analyzer tooling, defect database and " diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 610f30135c..4b03b4201a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: codechecker base: core18 -version: '6.20.0' +version: '6.20.0-rc1' summary: CodeChecker is an analyzer tooling, defect database and viewer extension description: | CodeChecker is an analyzer tooling, defect database and viewer extension. @@ -33,7 +33,7 @@ parts: codechecker: plugin: python python-version: python3 - source: https://github.com/Ericsson/codechecker/archive/v6.20.0.tar.gz + source: https://github.com/Ericsson/codechecker/archive/v6.20.0-rc1.tar.gz build-packages: - curl - gcc-multilib diff --git a/web/codechecker_web/shared/webserver_context.py b/web/codechecker_web/shared/webserver_context.py index f9a09edf87..ab38e8cfca 100644 --- a/web/codechecker_web/shared/webserver_context.py +++ b/web/codechecker_web/shared/webserver_context.py @@ -125,7 +125,8 @@ def __set_version(self): self.__package_version = package_version['major'] + '.' + \ package_version['minor'] + '.' + \ - package_version['revision'] + package_version['revision'] + \ + ('-rc' + package_version['rc'] if 'rc' in package_version else '') self.__package_build_date = package_build_date self.__package_git_hash = package_git_hash diff --git a/web/config/web_version.json b/web/config/web_version.json index c59ae6909f..3055006cbc 100644 --- a/web/config/web_version.json +++ b/web/config/web_version.json @@ -2,6 +2,7 @@ "version": { "major" : "6", "minor" : "20", - "revision" : "0" + "revision" : "0", + "rc": "1" } }