chore: identify version numbers using a git tag

- remove VERSION file - some smaller cleanups and warning fixes Fixes #12349
status-im · Oct 29, 2024 · 1eb40e4 · 1eb40e4
1 parent ab92672
commit 1eb40e4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -236,8 +236,7 @@ endif
 NIM_PARAMS += --outdir:./bin
 
 # App version
-VERSIONFILE=VERSION
-DESKTOP_VERSION=`cat $(VERSIONFILE)`
+DESKTOP_VERSION=`git describe --tags`
 STATUSGO_VERSION=`(cd vendor/status-go; git describe --tags --abbrev=0)`
 NIM_PARAMS += -d:DESKTOP_VERSION="$(DESKTOP_VERSION)"
 NIM_PARAMS += -d:STATUSGO_VERSION="$(STATUSGO_VERSION)"

diff --git a/VERSION b/VERSION
diff --git a/src/constants.nim b/src/constants.nim
@@ -12,7 +12,7 @@ const STATUSGO_VERSION* {.strdefine.} = "0.0.0"
 # This is changed during compilation by executing git command
 const GIT_COMMIT* {.strdefine.} = ""
 
-const APP_VERSION* = if defined(production): DESKTOP_VERSION else: fmt("{GIT_COMMIT}")
+const APP_VERSION* = if defined(production): DESKTOP_VERSION else: DESKTOP_VERSION % "-" % GIT_COMMIT
 
 const sep* = when defined(windows): "\\" else: "/"
 

diff --git a/src/env_cli_vars.nim b/src/env_cli_vars.nim
@@ -1,4 +1,4 @@
-import os, sequtils, strutils, stew/shims/strformat, chronicles
+import os, sequtils, strutils, chronicles
 
 import app/global/feature_flags
 

diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
@@ -44,7 +44,7 @@ proc determineStatusAppIconPath(): string =
   if defined(production):
     return "/../status.png"
 
-  return "/../status-dev.png" 
+  return "/../status-dev.png"
 
 proc prepareLogging() =
   # Outputs logs in the node tab

diff --git a/storybook/pages/AboutViewPage.qml b/storybook/pages/AboutViewPage.qml
@@ -30,7 +30,7 @@ SplitView {
 
                 function getCurrentVersion() {
                     logs.logEvent("store::getCurrentVersion")
-                    return isProduction ? "0.13.2" : "45784cf0c"
+                    return isProduction ? "v0.13.2" : "v0.13.2-dev"
                 }
 
                 function getStatusGoVersion() {

diff --git a/ui/app/AppLayouts/Profile/views/AboutView.qml b/ui/app/AppLayouts/Profile/views/AboutView.qml
@@ -68,7 +68,7 @@ SettingsContentBase {
                 font.pixelSize: 22
                 font.bold: true
                 normalColor: Theme.palette.directColor1
-                text: (root.store.isProduction ? "" : "git:") + root.store.getCurrentVersion()
+                text: root.store.getCurrentVersion().replace(/^v/, '')
                 onClicked: root.store.getReleaseNotes()
             }
 

diff --git a/ui/nim-status-client.pro b/ui/nim-status-client.pro
@@ -40,6 +40,8 @@ OTHER_FILES += $$files("$$PWD/../vendor/SortFilterProxyModel/*.h", true)
 
 OTHER_FILES += $$files("$$PWD/../vendor/nimqml/src/*.nim", true)
 
+OTHER_FILES += $$files("$$PWD/../Makefile")
+
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH = $$PWD/imports \
                   $$PWD/StatusQ \
@@ -49,9 +51,4 @@ QML_IMPORT_PATH = $$PWD/imports \
 # Additional import path used to resolve QML modules just for Qt Quick Designer
 QML_DESIGNER_IMPORT_PATH = $$PWD/imports
 
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
 RESOURCES += resources.qrc StatusQ/src/assets.qrc StatusQ/src/statusq.qrc