Skip to content

Commit

Permalink
Merge #550
Browse files Browse the repository at this point in the history
550: Revert "[cmake] mark dirty tree in the version string" r=Saviq a=Saviq

This reverts commit 760c9e2.

Unfortunately snapcraft dirtifies the build dir on Launchpad, so all our builds from there now have a `-dirty` suffix.

Co-authored-by: Michał Sawicz <[email protected]>
  • Loading branch information
bors[bot] and Saviq committed Dec 20, 2018
1 parent f85deac commit 1d24775
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ add_subdirectory(3rd-party)
find_package(Qt5Core REQUIRED)
find_package(Qt5Network REQUIRED)

execute_process(COMMAND git describe --dirty
execute_process(COMMAND git describe
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE MULTIPASS_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
Expand Down

0 comments on commit 1d24775

Please sign in to comment.