From 916bdb73582956912f0fc32d18a279fb1cbf0014 Mon Sep 17 00:00:00 2001 From: lukas Date: Mon, 15 Mar 2021 18:31:46 +0100 Subject: [PATCH] fix docker image --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 886853e..96f90ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ include: '/Docker/Linux_Conan/.gitlab-ci.yml' -image: luki42/dynuiprefresher_build:conanbuild +image: conanio/gcc10 stages: - docker @@ -13,12 +13,13 @@ cache: conan: stage: build - script: + before_script: - 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 - 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 + - CONAN_SYSREQUIRES_MODE=enabled CONAN_SYSREQUIRES_SUDO=0 conan install . --build=missing -g cmake -if build + script: + - cmake -S . -B build -D WinBuild=OFF #cmake project - cd build - make -j4 #build artifacts: