From 280c2ccd0fa559150e83f054c2d95dd08bcb797d Mon Sep 17 00:00:00 2001 From: Silvio Kunaschk Date: Thu, 9 May 2019 19:04:14 +0200 Subject: [PATCH] moved conan profiles into .ci folder --- .../conan_profile_linux_clang6.0 | 0 conan_profile_mingw8.2 => .ci/conan_profile_mingw8.2 | 0 azure-pipelines.yml | 6 ++++-- 3 files changed, 4 insertions(+), 2 deletions(-) rename conan_profile_linux_clang6.0 => .ci/conan_profile_linux_clang6.0 (100%) rename conan_profile_mingw8.2 => .ci/conan_profile_mingw8.2 (100%) diff --git a/conan_profile_linux_clang6.0 b/.ci/conan_profile_linux_clang6.0 similarity index 100% rename from conan_profile_linux_clang6.0 rename to .ci/conan_profile_linux_clang6.0 diff --git a/conan_profile_mingw8.2 b/.ci/conan_profile_mingw8.2 similarity index 100% rename from conan_profile_mingw8.2 rename to .ci/conan_profile_mingw8.2 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 13cc622e..d7dded46 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,6 +46,8 @@ jobs: versionSpec: $(python-version) - script: | export PATH="$PATH:/home/vsts/.local/bin" + export CC=clang-6.0 + export CXX=clang++-6.0 sudo apt install -y python3-setuptools pip install --user --upgrade pip pip install --user $(conan-pkg) @@ -56,7 +58,7 @@ jobs: conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan pushd . mkdir build && cd build - conan install .. -s build_type=Release --profile ../conan_profile_linux_clang6.0 --build=missing + conan install .. -s build_type=Release --profile ../.ci/conan_profile_linux_clang6.0 --build=missing cmake -DCMAKE_BUILD_TYPE=Release .. VERBOSE=1 make -j displayName: build VCVRack @@ -103,7 +105,7 @@ jobs: conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan mkdir build cd build - conan install .. -s build_type=Release --profile ../conan_profile_mingw8.1 --build=missing + conan install .. -s build_type=Release --profile ../.ci/conan_profile_mingw8.2 --build=missing cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release .. cmake --build . displayName: build VCVRack