diff --git a/.woodpecker.yml b/.woodpecker.yml index 6436828..0d422bc 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,12 +7,12 @@ steps: - source /opt/rh/gcc-toolset-9/enable - mkdir build-gcc - cd build-gcc - - cmake3 .. + - cmake3 -DRUN_PIPELINE .. - make -j2 - make test - cd .. - mkdir 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 test diff --git a/CMakeLists.txt b/CMakeLists.txt index 42d62e8..1234caa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 rev-list -n 1 ${GIT_TAG}" OUTPUT_VARIABLE GIT_TAG_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) message(STATUS "${GIT_HASH}") -message(STATUS "${GIT_TAG}") -if("${GIT_TAG}" EQUAL "") +if(DEFINED RUN_PIPELINE) set(VERSION "v0.0.0-test") else() message(STATUS "${GIT_TAG}")