More fixes for CI.
continuous-integration/drone/push Build is failing Details
continuous-integration/drone Build is failing Details

This commit is contained in:
Deukhoofd 2021-10-02 10:50:55 +02:00
parent 68f933cd77
commit 885bcde7c8
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
1 changed files with 3 additions and 16 deletions

View File

@ -2,18 +2,13 @@
kind: pipeline kind: pipeline
name: default name: default
workspace:
volumes: path: /home/build
- name: conan-data
temp: {}
type: docker type: docker
steps: steps:
- name: test-debug-linux - name: test-debug-linux
image: deukhoofd/linux64builder image: deukhoofd/linux64builder
volumes:
- name: conan-data
path: /root/.conan/data
environment: environment:
CC: clang CC: clang
CXX: clang++ CXX: clang++
@ -24,9 +19,6 @@ steps:
- build-debug/pkmnLibTests -s --duration=true --force-colors=true - build-debug/pkmnLibTests -s --duration=true --force-colors=true
- name: test-release-linux - name: test-release-linux
image: deukhoofd/linux64builder image: deukhoofd/linux64builder
volumes:
- name: conan-data
path: /root/.conan/data
environment: environment:
CC: clang CC: clang
CXX: clang++ CXX: clang++
@ -49,11 +41,7 @@ steps:
- run-clang-format.py -r src/ CInterface/ tests/ --color=always - run-clang-format.py -r src/ CInterface/ tests/ --color=always
- name: test-release-windows - name: test-release-windows
image: deukhoofd/windowsbuilder image: deukhoofd/windowsbuilder
volumes:
- name: conan-data
path: /root/.conan/data
environment: environment:
CONAN_CMAKE_FIND_ROOT_PATH: /usr/x86_64-w64-mingw32
CHOST: x86_64-w64-mingw32 CHOST: x86_64-w64-mingw32
AR: x86_64-w64-mingw32-ar AR: x86_64-w64-mingw32-ar
AS: x86_64-w64-mingw32-as AS: x86_64-w64-mingw32-as
@ -62,7 +50,6 @@ steps:
CXX: x86_64-w64-mingw32-g++ CXX: x86_64-w64-mingw32-g++
STRIP: x86_64-w64-mingw32-strip STRIP: x86_64-w64-mingw32-strip
RC: x86_64-w64-mingw32-windres RC: x86_64-w64-mingw32-windres
CONAN_ENV_COMPILER_VERSION: 9.3
commands: 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 -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 - 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 - wine64 build-release-windows/pkmnLibTests.exe -s --duration=true --force-colors=true
--- ---
kind: signature kind: signature
hmac: ff6cd9d434d4667d0354e9203c9da78788080788f9c5190228fcb6a6563d4d63 hmac: 2171c6543fdbf28c73f54cc4007d55d912ba92d431694135f33af5c9ecba8c7e
... ...