Changes for new build image on Windows.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2021-09-30 18:01:38 +02:00
parent accf582a51
commit 3cf211c66f
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
1 changed files with 1 additions and 6 deletions

View File

@ -64,11 +64,6 @@ steps:
RC: x86_64-w64-mingw32-windres RC: x86_64-w64-mingw32-windres
CONAN_ENV_COMPILER_VERSION: 9.3 CONAN_ENV_COMPILER_VERSION: 9.3
commands: 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 -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
- cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/ - cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/
@ -78,6 +73,6 @@ steps:
- wine build-release-windows/pkmnLibTests.exe -s --duration=true --force-colors=true - wine build-release-windows/pkmnLibTests.exe -s --duration=true --force-colors=true
--- ---
kind: signature kind: signature
hmac: ecda7946c935600dff9785e1068de0bdc7c1a637ad8c9c3724f10708e00194fe hmac: 7195edda2f96357afc1cae759e87c27234ebd7db2aea93e78129d8d18a21a624
... ...