Skip to content
Permalink
Browse files

Merge pull request #1203 from simonsan/add-ci-version

Add CI config version to openage --version
  • Loading branch information
TheJJ committed Jan 28, 2020
2 parents 4cbc3c0 + a66ff10 commit 69db719a50d998117a0771829976851af484ad2b
Showing with 12 additions and 2 deletions.
  1. +7 −0 CMakeLists.txt
  2. +4 −2 openage/__init__.py
  3. +1 −0 openage/config.py.in
@@ -195,6 +195,13 @@ if(USED_GIT_VERSION)
endif()
project(openage VERSION "${PROJECT_VERSION}")

# set CI version
if(DEFINED ENV{CI_CFG_VERSION})
set(CI_CFG_VERSION "$ENV{CI_CFG_VERSION}")
else()
set(CI_CFG_VERSION "NOT SET")
endif()


##################################################
# documentation generation
@@ -32,14 +32,16 @@
"openage {version}{devmode}\n"
"{config_options}\n"
"{compiler} [{compilerflags}]\n"
"Cython {cython}"
"Cython {cython}\n"
"CI config version {cicfg}"
).format(
version=config.VERSION,
devmode=(" [devmode]" if config.DEVMODE else ""),
config_options=config.CONFIG_OPTIONS,
compiler=config.COMPILER,
compilerflags=config.COMPILERFLAGS,
cython=config.CYTHONVERSION
cython=config.CYTHONVERSION,
cicfg=config.CICFGVERSION
)

setup_logging()
@@ -24,6 +24,7 @@ CONFIG_OPTIONS = "${CONFIG_OPTION_STRING}"
COMPILER = "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
COMPILERFLAGS = "${CMAKE_CXX_FLAGS}"
CYTHONVERSION = "${CYTHON_VERSION}"
CICFGVERSION = "${CI_CFG_VERSION}"

# features
WITH_NCURSES = ("${WITH_NCURSES}" == "true")

0 comments on commit 69db719

Please sign in to comment.
You can’t perform that action at this time.