diff --git a/.drone.yml b/.drone.yml index 8de6955cb..846b7ec4e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,7 +37,10 @@ trigger: kind: pipeline type: docker -name: Build Linux Binaries +name: Build Linux + +clone: + depth: 1 # Limits how many of these builds can run on the drone runner at a time, this isn't about cores concurrency: @@ -72,7 +75,7 @@ trigger: kind: pipeline type: exec -name: Build Windows Binaries +name: Build Windows clone: depth: 1 @@ -129,8 +132,8 @@ steps: rclone delete remote: --include "eqemu-server*.zip" depends_on: - - Build Windows Binaries - - Build Linux Binaries + - Build Windows + - Build Linux trigger: branch: diff --git a/utils/scripts/build/linux-build.sh b/utils/scripts/build/linux-build.sh index ad201b8ae..916f6b0ba 100755 --- a/utils/scripts/build/linux-build.sh +++ b/utils/scripts/build/linux-build.sh @@ -12,6 +12,7 @@ mkdir -p build && cd build && cmake -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=O curl https://raw.githubusercontent.com/Akkadius/eqemu-install-v2/master/eqemu_config.json --output eqemu_config.json ./bin/tests +chmod +x ./utils/scripts/build/should-release/should-release ./utils/scripts/build/should-release/should-release || exit rm ./build/bin/*.a diff --git a/utils/scripts/build/windows-build.ps1 b/utils/scripts/build/windows-build.ps1 index f27913619..fca9ac8f7 100644 --- a/utils/scripts/build/windows-build.ps1 +++ b/utils/scripts/build/windows-build.ps1 @@ -19,10 +19,10 @@ try cmake --build . --config RelWithDebInfo --clean-first Set-Location -Path "$cwd" - 7z a eqemu-server-windows-x64.zip $cwd\win-build-x64\bin\RelWithDebInfo\*.exe $cwd\win-build-x64\bin\RelWithDebInfo\*.dll $cwd\win-build-x64\bin\RelWithDebInfo\*.pdb $cwd\win-build-x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\win-build-x64\libs\zlibng\RelWithDebInfo\*.pdb - .\utils\scripts\build\should-release\should-release.exe; if ($LASTEXITCODE -ne 0) { exit } + 7z a eqemu-server-windows-x64.zip $cwd\win-build-x64\bin\RelWithDebInfo\*.exe $cwd\win-build-x64\bin\RelWithDebInfo\*.dll $cwd\win-build-x64\bin\RelWithDebInfo\*.pdb $cwd\win-build-x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\win-build-x64\libs\zlibng\RelWithDebInfo\*.pdb + dir *.zip rclone config create remote ftp env_auth true rclone copy eqemu-server-windows-x64.zip remote: