From 1b08dbc3657f6fc78ed07e1227adfa6be589acde Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 2 Oct 2021 16:41:25 +0200 Subject: [PATCH] Updates for new Windows CI Signed-off-by: Deukhoofd --- .drone.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9cac404..f226466 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,8 +3,6 @@ kind: pipeline name: default volumes: - - name: conan-data - temp: { } - name: docs host: path: /home/docs/CreatureLib @@ -13,27 +11,19 @@ type: docker steps: - name: test-debug-linux image: deukhoofd/linux64builder - volumes: - - name: conan-data - path: /root/.conan/data environment: CC: /usr/bin/clang CXX: /usr/bin/clang++ commands: - - conan remote add epsilon-public https://packages.p-epsilon.com/ - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-debug -DSTATICC=ON -DTESTS=ON - cmake --build build-debug --target all -- -j 4 - build-debug/CreatureLibTests -s --duration=true --force-colors=true - name: test-release-linux image: deukhoofd/linux64builder - volumes: - - name: conan-data - path: /root/.conan/data environment: CC: /usr/bin/clang CXX: /usr/bin/clang++ commands: - - 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/CreatureLibTests -s --duration=true --force-colors=true @@ -46,11 +36,6 @@ steps: environment: CONAN_ENV_COMPILER_VERSION: 9.3 commands: - - conan remote add epsilon-public https://packages.p-epsilon.com/ - - update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix - - update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix - - update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix - - 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 - export WINEARCH=win64 @@ -74,6 +59,6 @@ steps: - ( cat Doxyfile ; echo "OUTPUT_DIRECTORY=/docs"; echo "GENERATE_TAGFILE=/docs/html/CreatureLib.tag" ) | doxygen - --- kind: signature -hmac: b2f1540b00f641eef3a388ecde2217fca4b036beefaeeff47caaee834092f134 +hmac: 65b47dc220872026c108c3bb2878a81f8fb4a4c232e288ee496e96e398fe0cc0 ...