This commit is contained in:
parent
28e14e1604
commit
b0810b80b7
2 changed files with 3 additions and 4 deletions
|
@ -7,12 +7,12 @@ steps:
|
||||||
- source /opt/rh/gcc-toolset-9/enable
|
- source /opt/rh/gcc-toolset-9/enable
|
||||||
- mkdir build-gcc
|
- mkdir build-gcc
|
||||||
- cd build-gcc
|
- cd build-gcc
|
||||||
- cmake3 ..
|
- cmake3 -DRUN_PIPELINE ..
|
||||||
- make -j2
|
- make -j2
|
||||||
- make test
|
- make test
|
||||||
- cd ..
|
- cd ..
|
||||||
- mkdir build-clang
|
- mkdir build-clang
|
||||||
- cd build-clang
|
- cd build-clang
|
||||||
- CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake3 ..
|
- CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake3 -DRUN_PIPELINE ..
|
||||||
- make -j2
|
- make -j2
|
||||||
- make test
|
- make test
|
||||||
|
|
|
@ -6,8 +6,7 @@ execute_process(COMMAND bash "-c" "git rev-parse HEAD" OUTPUT_VARIABLE GIT_HASH
|
||||||
execute_process(COMMAND bash "-c" "git tag -l --sort=refname 'v*' | tail -n1" OUTPUT_VARIABLE GIT_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
|
execute_process(COMMAND bash "-c" "git tag -l --sort=refname 'v*' | tail -n1" OUTPUT_VARIABLE GIT_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
execute_process(COMMAND bash "-c" "git rev-list -n 1 ${GIT_TAG}" OUTPUT_VARIABLE GIT_TAG_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
|
execute_process(COMMAND bash "-c" "git rev-list -n 1 ${GIT_TAG}" OUTPUT_VARIABLE GIT_TAG_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
message(STATUS "${GIT_HASH}")
|
message(STATUS "${GIT_HASH}")
|
||||||
message(STATUS "${GIT_TAG}")
|
if(DEFINED RUN_PIPELINE)
|
||||||
if("${GIT_TAG}" EQUAL "")
|
|
||||||
set(VERSION "v0.0.0-test")
|
set(VERSION "v0.0.0-test")
|
||||||
else()
|
else()
|
||||||
message(STATUS "${GIT_TAG}")
|
message(STATUS "${GIT_TAG}")
|
||||||
|
|
Loading…
Reference in a new issue