From ed1d6eb8fd0000e8579a977e51a706bae259166a Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Fri, 22 Feb 2019 21:57:10 -0500 Subject: [PATCH] Add gitlab CI. --- .gitlab-ci.yml | 23 +++++++++++++++++++++++ CMakeLists.txt | 8 ++++---- 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..e91b2168 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,23 @@ +stages: + - build + - test + - lint + +image: brndnmtthws/conky-builder:latest + +build: + script: + - mkdir build + - cd build + - cmake .. + - make -j4 + +test: + script: + - cd build + - make test + +lint: + - cd build + - cmake -DCHECK_CODE_QUALITY=ON .. + - make check diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bf10212..291bf0d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,10 +95,10 @@ if(MAINTAINER_MODE) endif(MAINTAINER_MODE) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - install(FILES conky.desktop DESTINATION share/applications) - install(FILES logo/conky-logomark-violet.svg DESTINATION share/icons/hicolor/scalable/apps) -endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - + install(FILES conky.desktop DESTINATION share/applications) + install(FILES logo/conky-logomark-violet.svg + DESTINATION share/icons/hicolor/scalable/apps) +endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(CHECK_CODE_QUALITY) # Set up clang-tidy