From b6213bdb269a367d2c7c1c0703cd6989fe11800c Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sat, 9 Mar 2019 14:50:46 -0500 Subject: [PATCH] Test `make install` target, and release build. --- .gitlab-ci.yml | 13 +++++++++++++ appimage/build.sh | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4dffc104..36cc5e2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -467,6 +467,19 @@ freebsd12 clang-7: - if [ "$COMPILER" == "clang-7" ] ; then make -j4 test-conky-coverage-txt ; fi - if [ "$COMPILER" == "clang-7" ] ; then make -j4 test-conky-coverage-html ; fi - if [ "$COMPILER" == "clang-7" ] ; then lcov-summary test-conky-coverage-html.info.cleaned ; fi + - make -j4 + - if [[ "$DISTRO" == "freebsd12" ]] ; then sudo make install ; else make install ; fi + - conky -v + - > + cmake + -DCMAKE_C_COMPILER_LAUNCHER=sccache + -DCMAKE_CXX_COMPILER_LAUNCHER=sccache + -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DRELEASE=ON + .. + - make -j4 + - if [[ "$DISTRO" == "freebsd12" ]] ; then sudo make install ; else make install ; fi + - conky -v coverage: '/Total Coverage:\s+(\d+\.\d+)%/' artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME-coverage-report" diff --git a/appimage/build.sh b/appimage/build.sh index 36f05736..0d5393e6 100755 --- a/appimage/build.sh +++ b/appimage/build.sh @@ -30,7 +30,7 @@ pushd "$BUILD_DIR" # configure build files with cmake # we need to explicitly set the install prefix, as CMake's default is /usr/local for some reason... -cmake -DRELEASE=ON -DCMAKE_INSTALL_PREFIX=/usr "$REPO_ROOT" +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DRELEASE=ON -DCMAKE_INSTALL_PREFIX=/usr "$REPO_ROOT" # build project and install files into AppDir make -j4