Skip to content

Commit 66f7f8d

Browse files
committed
use .env and not environment variable for VERSION
1 parent f3f6e47 commit 66f7f8d

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VERSION=0.9.5.6

CMakeLists.txt

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -118,25 +118,29 @@ else()
118118
endif()
119119
message("CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
120120

121-
set(VERSION $ENV{VERSION})
122-
if ("${VERSION}" STREQUAL "")
121+
# HACK: look for version in parent folder .env
122+
if(EXISTS ".env")
123+
execute_process(COMMAND git log -n1 --pretty=%h .env OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE HASH_ENV)
124+
file(STRINGS ".env" CONFIG REGEX "^[ ]*[A-Za-z0-9_]+[ ]*=")
125+
list(TRANSFORM CONFIG STRIP)
126+
list(TRANSFORM CONFIG REPLACE "([^=]+)=[ ]*(.*)" "set(\\1 \"\\2\")\n")
127+
message(${CONFIG})
128+
cmake_language(EVAL CODE ${CONFIG})
129+
message("Parsed config")
130+
else()
123131
message(WARNING "VERSION IS NOT SET")
124-
# HACK: look for version in parent folder .env
125-
if(EXISTS "../.env")
126-
file(STRINGS "../.env" CONFIG REGEX "^[ ]*[A-Za-z0-9_]+[ ]*=")
127-
list(TRANSFORM CONFIG STRIP)
128-
list(TRANSFORM CONFIG REPLACE "([^=]+)=[ ]*(.*)" "set(\\1 \"\\2\")\n")
129-
message(${CONFIG})
130-
cmake_language(EVAL CODE ${CONFIG})
131-
message("Parsed config")
132-
else()
133-
# no version set
134-
set(VERSION "?.?.?.?")
135-
endif()
132+
# no version set
133+
set(VERSION "?.?.?.?")
136134
endif()
137135

138136
execute_process(COMMAND git rev-parse --short --verify HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE HASH)
139137
execute_process(COMMAND git diff-index --quiet HEAD RESULT_VARIABLE GIT_CHANGED)
138+
139+
if (NOT "${HASH_ENV}" STREQUAL "${HASH}")
140+
# add + to version if .env isn't from current commit
141+
set(VERSION "${VERSION}+")
142+
endif()
143+
140144
set(MODIFIED_TIME "")
141145

142146
message("Compiler is ${CMAKE_CXX_COMPILER}")

0 commit comments

Comments
 (0)