fix cleanup after conan build

This commit is contained in:
Lukas Heiligenbrunner 2020-11-04 20:28:04 +01:00
parent 0d5c7a61b4
commit 2b00bc61cf
2 changed files with 4 additions and 6 deletions

View File

@ -1,6 +1,6 @@
include: '/Docker/Linux_Conan/.gitlab-ci.yml' include: '/Docker/Linux_Conan/.gitlab-ci.yml'
image: conanio/gcc9:latest image: luki42/dynuiprefresher_build:conanbuild
stages: stages:
- docker - docker
@ -14,17 +14,15 @@ cache:
conan: conan:
stage: build stage: build
script: 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 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 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 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 - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force
- mkdir -p build # create build folder - mkdir -p build # create build folder
- CONAN_SYSREQUIRES_MODE=disabled conan install . --build=missing -g cmake -if build - CONAN_SYSREQUIRES_MODE=disabled conan install . --build=missing -g cmake -if build
- cmake -S . -B build -D WinBuild=OFF -D GUI=OFF #cmake project - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF #cmake project
- cd build - cd build
- make #build - make -j4 #build
artifacts: artifacts:
paths: paths:
- build/bin/ - build/bin/

View File

@ -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 bintray https://api.bintray.com/conan/lheili/LibConfig --force
conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force
mkdir -p build # create build folder 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 # cleanup
conan remove -s -t -f conan remove "*" -s -b -f
cd .. cd ..
rm -Rf ./dynuiprefresher rm -Rf ./dynuiprefresher