From 885bcde7c8a19653fec96a3a4816feaf23e0b8d7 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 2 Oct 2021 10:50:55 +0200 Subject: [PATCH] More fixes for CI. --- .drone.yml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 894da5e..08f0c31 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,18 +2,13 @@ kind: pipeline name: default - -volumes: - - name: conan-data - temp: {} +workspace: + path: /home/build type: docker steps: - name: test-debug-linux image: deukhoofd/linux64builder - volumes: - - name: conan-data - path: /root/.conan/data environment: CC: clang CXX: clang++ @@ -24,9 +19,6 @@ steps: - build-debug/pkmnLibTests -s --duration=true --force-colors=true - name: test-release-linux image: deukhoofd/linux64builder - volumes: - - name: conan-data - path: /root/.conan/data environment: CC: clang CXX: clang++ @@ -49,11 +41,7 @@ steps: - run-clang-format.py -r src/ CInterface/ tests/ --color=always - name: test-release-windows image: deukhoofd/windowsbuilder - volumes: - - name: conan-data - path: /root/.conan/data environment: - CONAN_CMAKE_FIND_ROOT_PATH: /usr/x86_64-w64-mingw32 CHOST: x86_64-w64-mingw32 AR: x86_64-w64-mingw32-ar AS: x86_64-w64-mingw32-as @@ -62,7 +50,6 @@ steps: CXX: x86_64-w64-mingw32-g++ STRIP: x86_64-w64-mingw32-strip RC: x86_64-w64-mingw32-windres - CONAN_ENV_COMPILER_VERSION: 9.3 commands: - cmake -GNinja -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 -DSHARED=ON - cmake --build build-release-windows --target all -- -j 4 @@ -72,6 +59,6 @@ steps: - wine64 build-release-windows/pkmnLibTests.exe -s --duration=true --force-colors=true --- kind: signature -hmac: ff6cd9d434d4667d0354e9203c9da78788080788f9c5190228fcb6a6563d4d63 +hmac: 2171c6543fdbf28c73f54cc4007d55d912ba92d431694135f33af5c9ecba8c7e ...