From 2b00bc61cf742a16d852a8a0ba3e960419ef07aa Mon Sep 17 00:00:00 2001 From: Lukas Heiligenbrunner Date: Wed, 4 Nov 2020 20:28:04 +0100 Subject: [PATCH] fix cleanup after conan build --- .gitlab-ci.yml | 6 ++---- Docker/Linux_Conan/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbf96fc..1bee0a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ include: '/Docker/Linux_Conan/.gitlab-ci.yml' -image: conanio/gcc9:latest +image: luki42/dynuiprefresher_build:conanbuild stages: - docker @@ -14,17 +14,15 @@ cache: conan: stage: build script: - - export CONAN_USER_HOME=$PWD/.conan #define .conan folder to be inside of project - conan profile new default --detect --force # Generates default profile detecting GCC and sets old ABI - conan profile update settings.compiler.libcxx=libstdc++11 default # Sets libcxx to C++11 ABI - conan remote add bintray https://api.bintray.com/conan/lheili/LibConfig --force - - conan user lukas-heiligenbrunner -r bintray -p $CONAN_KEY - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force - mkdir -p build # create build folder - CONAN_SYSREQUIRES_MODE=disabled conan install . --build=missing -g cmake -if build - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF #cmake project - cd build - - make #build + - make -j4 #build artifacts: paths: - build/bin/ diff --git a/Docker/Linux_Conan/build.sh b/Docker/Linux_Conan/build.sh index 4e7af7c..deb19a5 100644 --- a/Docker/Linux_Conan/build.sh +++ b/Docker/Linux_Conan/build.sh @@ -13,11 +13,11 @@ conan profile update settings.compiler.libcxx=libstdc++11 default # Sets libcxx conan remote add bintray https://api.bintray.com/conan/lheili/LibConfig --force conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force mkdir -p build # create build folder -CONAN_SYSREQUIRES_MODE=enabled CONAN_SYSREQUIRES_SUDO=0 conan install . --build=missing -g none +CONAN_SYSREQUIRES_MODE=enabled CONAN_SYSREQUIRES_SUDO=0 conan install . --build=missing # cleanup -conan remove -s -t -f +conan remove "*" -s -b -f cd .. rm -Rf ./dynuiprefresher