From 894a644f50ec280ae6767fbccfb8a95c8e2fc6dc Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Wed, 26 Feb 2020 14:10:02 +0100 Subject: [PATCH] Fixes for .drone file. --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 555dcb3..0065aed 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,9 +10,9 @@ steps: CXX: /usr/bin/clang++ commands: - conan remote add epsilon-public https://packages.p-epsilon.com/artifactory/api/conan/epsilon-public - - cmake -DCMAKE_BUILD_TYPE=Debug . -B build-debug + - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-debug - cmake --build build-debug --target all -- -j 4 - - build-debug/CreatureLibTests -s --durations yes --use-colour yes + - build-debug/bin/CreatureLibTests -s --durations yes --use-colour yes - name: test-release-linux image: deukhoofd/linux64builder environment: @@ -20,10 +20,10 @@ steps: CXX: /usr/bin/clang++ commands: - conan remote add epsilon-public https://packages.p-epsilon.com/artifactory/api/conan/epsilon-public - - cmake -DCMAKE_BUILD_TYPE=Release . -B build-release + - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-release - cmake --build build-release --target all -- -j 4 - - build-release/CreatureLibTests -s --durations yes --use-colour yes - - valgrind --tool=memcheck --gen-suppressions=all --leak-check=full --leak-resolution=med --track-origins=yes --vgdb=no --error-exitcode=1 build-release/CreatureLibTests + - build-release/bin/CreatureLibTests -s --durations yes --use-colour yes + - valgrind --tool=memcheck --gen-suppressions=all --leak-check=full --leak-resolution=med --track-origins=yes --vgdb=no --error-exitcode=1 build-release/bin/CreatureLibTests - name: test-release-windows image: deukhoofd/windowsbuilder commands: @@ -35,7 +35,7 @@ steps: - cmake -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DWINDOWS=ON - cmake --build build-release-windows --target all -- -j 4 - export WINEARCH=win64 - - wine build-release-windows/CreatureLibTests.exe -s + - wine build-release-windows/bin/CreatureLibTests.exe -s - name: conan-deploy image: deukhoofd/linux64builder environment: