firmware string based on firmewareVersion instead of git

Kolkman · Sep 21, 2022 · 515cfaa · 515cfaa
1 parent a19833e
commit 515cfaa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/create_release_script.py b/create_release_script.py
@@ -4,13 +4,13 @@
 
 
 result = subprocess.run(
-    ['git', 'describe', '--tags', '--abbrev=0'], stdout=subprocess.PIPE)
-version = result.stdout.decode('utf-8')[:-1]
+    ['cat','./firmwareVersion'], stdout=subprocess.PIPE)
+version = result.stdout.decode('utf-8').strip()
 print("Version " + str(version))
 print("Current CLI targets", COMMAND_LINE_TARGETS)
 print("Current Build targets", BUILD_TARGETS)
 
-# print(env.Dump())
+#print(env.Dump())
 
 
 def post_program_action(source, target, env):

diff --git a/firmwareVersion b/firmwareVersion
@@ -0,0 +1 @@
+v1.0.1
diff --git a/platformio.ini b/platformio.ini
@@ -21,7 +21,8 @@ lib_deps =
 	bblanchon/StreamUtils @ ^1.6.3
 	ayushsharma82/AsyncElegantOTA@^2.2.7
 build_flags = !make 
-	!echo '-D FIRMWAREVERSION=\\"'$(git describe --tags --abbrev=0)'\\"'
+   -DFIRMWAREVERSION='"v1.0.1"'
+	!echo '-D FIRMWAREVERSION=\\"'$(cat ./firmwareVersion)'\\"'
 extra_scripts = post:create_release_script.py
 
 [env:esp32dev-prod]