diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96f90ab..d2ec611 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,25 @@ cache: paths: - .conan/ -conan: +conan_linux: stage: build + 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=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: + paths: + - build/bin/ + expire_in: 1 days + +conan_windows: + stage: build + image: luki42/dynuiprefresher_build:latest 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 diff --git a/Docker/Linux_Conan/Dockerfile b/Docker/Linux_Conan/Dockerfile index 307def4..915bd4d 100644 --- a/Docker/Linux_Conan/Dockerfile +++ b/Docker/Linux_Conan/Dockerfile @@ -1,4 +1,4 @@ -FROM gcc:latest +FROM mwaeckerlin/mingw:latest COPY ./build.sh /tmp/ diff --git a/Docker/Linux_Conan/build.sh b/Docker/Linux_Conan/build.sh index deb19a5..0b48ad1 100644 --- a/Docker/Linux_Conan/build.sh +++ b/Docker/Linux_Conan/build.sh @@ -10,8 +10,6 @@ git checkout conansupport 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 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