Update version approach (#295)

unicef-drp · Aug 20, 2024 · 87c97cc · 87c97cc
1 parent 885f2d8
commit 87c97cc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 37 deletions.
diff --git a/django_project/version/commit.txt → django_project/_commit_hash.txt b/django_project/version/commit.txt → django_project/_commit_hash.txt
diff --git a/django_project/version/version.txt → django_project/_version.txt b/django_project/version/version.txt → django_project/_version.txt
diff --git a/django_project/version/commit.sh → django_project/_version_update.sh b/django_project/version/commit.sh → django_project/_version_update.sh
@@ -12,4 +12,6 @@
 # __author__ = '[email protected]'
 # __date__ = '13/06/2023'
 # __copyright__ = ('Copyright 2023, Unicef')
-exec git rev-parse --verify HEAD > commit.txt
+
+exec git describe --tags > _version.txt
+exec git rev-parse --verify HEAD > _commit_hash.txt
diff --git a/django_project/core/context_processors/global_context.py b/django_project/core/context_processors/global_context.py
@@ -27,12 +27,12 @@
 
 def project_version(request):
     """Read project version from file."""
-    folder = ABS_PATH('version')
+    folder = ABS_PATH('')
     version = ''
-    version_file = os.path.join(folder, 'version.txt')
+    version_file = os.path.join(folder, '_version.txt')
     if os.path.exists(version_file):
         version += (open(version_file, 'rb').read()).decode("utf-8")
-    commit_file = os.path.join(folder, 'commit.txt')
+    commit_file = os.path.join(folder, '_commit_hash.txt')
     if os.path.exists(commit_file):
         commit = (open(commit_file, 'rb').read()).decode("utf-8")[:5]
         if commit:

diff --git a/django_project/version/__init__.py b/django_project/version/__init__.py
diff --git a/django_project/version/version.sh b/django_project/version/version.sh