#5: Adds VERSION and BUILD instead of just VERSION made of both

Author: tlex

build.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 
-echo "Setting VERSION='${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}' in src/constants.py"
-echo "VERSION = '${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}'" >> src/constants.py
+echo "Setting VERSION"
+find . -name .git -type d -prune -o -type f -name constants.py -exec sed -i s/^VERSION.*/VERSION\ =\ \'${CI_COMMIT_REF_NAME}\'/g {} + -exec grep VERSION {} +
+echo "Setting BUILD"
+find . -name .git -type d -prune -o -type f -name constants.py -exec sed -i s/^BUILD.*/BUILD\ =\ \'${CI_COMMIT_SHORT_SHA}\'/g {} + -exec grep BUILD {} +

src/etherscan-exporter.py

@@ -10,7 +10,7 @@
 import pygelf
 from prometheus_client import start_http_server
 from prometheus_client.core import REGISTRY, GaugeMetricFamily
-import constants
+from .lib import constants
 
 LOG = logging.getLogger(__name__)
 logging.basicConfig(
@@ -21,6 +21,7 @@
 )
 
 FILENAME = os.path.splitext(sys.modules['__main__'].__file__)[0]
+version = f'{constants.VERSION}-{constants.BUILD}'
 
 
 def configure_logging():
@@ -166,8 +167,7 @@ def collect(self):
 if __name__ == '__main__':
     configure_logging()
     PORT = int(os.environ.get('PORT', 9308))
-    # pylint: disable=no-member
-    LOG.info("Starting {} {} on port {}".format(FILENAME, constants.VERSION, PORT))
+    LOG.info("Starting {} {} on port {}".format(FILENAME, version, PORT))
     REGISTRY.register(EtherscanCollector())
     start_http_server(PORT)
     while True:

src/lib/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-

src/constants.py src/lib/constants.pysrc/constants.py renamed to src/lib/constants.py

@@ -2,4 +2,6 @@
 # -*- coding: utf-8 -*-
 """ Constants declarations """
 
+# These get set at build time
 VERSION = None
+BUILD = None