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.

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

Declarative Jenkins pipeline #1976

Merged
merged 22 commits into from
Nov 21, 2017
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ trim_trailing_whitespace = false

[*.{json,yml,toml}]
indent_size = 2

[Jenkinsfile]
indent_size = 2
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,6 @@ if (OGS_FATAL_ABORT)
add_definitions(-DOGS_FATAL_ABORT)
endif()

if(OGS_BUILD_TESTS)
set(Data_SOURCE_DIR ${PROJECT_SOURCE_DIR}/Tests/lfs-data CACHE INTERNAL "")
set(Data_BINARY_DIR ${PROJECT_BINARY_DIR}/Tests/lfs-data CACHE INTERNAL "")
endif()

# Logging level
add_definitions(-DLOGOG_LEVEL=${OGS_LOG_LEVEL})

Expand Down
Loading