From 41ec913de5d0417f3baf3f6dd603b33b35e9ce9d Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 18 Jul 2020 12:57:17 +0200 Subject: [PATCH] Fix paths. --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 35ce03c..e33113e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,14 +33,14 @@ steps: - conan remote add epsilon-public https://packages.p-epsilon.com/ - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-release -DSTATICC=ON -DTESTS=ON - cmake --build build-release --target all -- -j 4 - - build-release/bin/pkmnLibTests -s --durations yes --use-colour yes + - build-release/pkmnLibTests -s --durations yes --use-colour yes - name: valgrind-release-linux image: deukhoofd/linux64builder volumes: - name: conan-data path: /root/.conan/data commands: - - valgrind --tool=memcheck --gen-suppressions=all --leak-check=full --leak-resolution=med --track-origins=yes --vgdb=no --error-exitcode=1 --suppressions=angelscript.supp build-release/bin/pkmnLibTests + - valgrind --tool=memcheck --gen-suppressions=all --leak-check=full --leak-resolution=med --track-origins=yes --vgdb=no --error-exitcode=1 --suppressions=angelscript.supp build-release/pkmnLibTests - name: style-check image: deukhoofd/linux64builder failure: ignore @@ -69,10 +69,9 @@ steps: - update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix - 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 -DSTATICC=ON -DTESTS=ON - cmake --build build-release-windows --target all -- -j 4 - - cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/bin/ - - cp /drone/src/build-release-windows/lib/libpkmnLib.so /drone/src/build-release-windows/bin/ + - cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/ - export WINEARCH=win64 - - wine build-release-windows/bin/pkmnLibTests.exe -s --durations yes --use-colour yes + - wine build-release-windows/pkmnLibTests.exe -s --durations yes --use-colour yes - name: conan-deploy image: deukhoofd/linux64builder volumes: @@ -85,6 +84,7 @@ steps: from_secret: conan_password commands: - rm -rf build-debug + - rm -rf build-release - rm -rf build-release-windows - conan remote add epsilon-public https://packages.p-epsilon.com/ - cmake -DCMAKE_BUILD_TYPE=Release . -B build-conan -D CMAKE_C_COMPILER=/usr/bin/clang -D CMAKE_CXX_COMPILER=clang++ -DWINDOWS=0