Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only use local clang-format 7 or 8 #1487

Merged
merged 1 commit into from Oct 15, 2019
Merged

Only use local clang-format 7 or 8 #1487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -277,8 +277,8 @@ if (CLANG_FORMAT)
message(FATAL_ERROR "Could not parse clang-format version ${CLANG_FORMAT_VERSION_OUTPUT}")
endif ()

if(${CMAKE_MATCH_1} LESS "7")
message(WARNING "clang-format is out of date (at least version 7 required)")
if((${CMAKE_MATCH_1} LESS "7") OR (${CMAKE_MATCH_1} GREATER "8"))
message(WARNING "clang-format version 7 or 8 required")
set(CLANG_FORMAT False)
endif()
endif ()
Expand All @@ -291,7 +291,7 @@ if (NOT CLANG_FORMAT)
else ()
message(STATUS "Using docker based clang-format")
add_custom_target(format
COMMAND docker run -it -v ${PROJECT_SOURCE_DIR}:/timescaledb timescaledev/postgres-dev-clang:clang7-pg11.1 /timescaledb/scripts/clang_format_all.sh
COMMAND docker run --rm -it -v ${PROJECT_SOURCE_DIR}:/timescaledb timescaledev/postgres-dev-clang:clang7-pg11.1 /timescaledb/scripts/clang_format_all.sh
)
endif()
else()
Expand Down