From 1073aecf79757b7aa3fffd27d95680b6acc97f67 Mon Sep 17 00:00:00 2001
From: DevTekVE <devtekve@gmail.com>
Date: Sat, 9 Dec 2023 23:09:22 +0000
Subject: [PATCH] Update version handling in GitLab CI configuration

---
 .gitlab-ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9e1416bff..e2bbf9279e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
   BUILD_DIR: "/data/openpilot"
   OUTPUT_DIR: "${CI_PROJECT_DIR}/output"
   CI_DIR: "${CI_PROJECT_DIR}/release/ci"
-  VERSION: "unknown"
+  VERSION: '$(date "+%Y.%m.%d")'
   GIT_SUBMODULE_STRATEGY: recursive
   GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
   DEV_C3_SOURCE_BRANCH: "master-dev-c3"
@@ -22,7 +22,7 @@ default:
     - x86
 
 .default_before_script: &default_before_script
-  - 'export VERSION=$(date "+%Y.%m.%d")${EXTRA_VERSION_IDENTIFIER}'
+  - 'export VERSION=$(eval echo $VERSION)${EXTRA_VERSION_IDENTIFIER}'
   - 'mkdir -p "${BUILD_DIR}/"'
   - 'git config --global user.email "${GIT_CONFIG_USER_EMAIL}"'
   - 'git config --global user.name "${GIT_CONFIG_USER_NAME}"'
@@ -51,11 +51,15 @@ workflow: # If running on any branch other than main, use the `aws-datacontracts
     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
       variables:
         NEW_BRANCH: "staging-c3"
+        VERSION: '$(cat common/version.h | awk -F[\"-]  "{print $2}")'
+        EXTRA_VERSION_IDENTIFIER: "-staging"
       when: always
     # if tag
     - if: $CI_COMMIT_TAG
       variables:
         NEW_BRANCH: "release-c3"
+        VERSION: '$(cat common/version.h | awk -F[\"-]  "{print $2}")'
+        EXTRA_VERSION_IDENTIFIER: "-release"
     - when: always