From c445f7bed648e42ba8302e8c1cd12cc46a649bfb Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Sun, 25 Dec 2022 01:17:23 -0600
Subject: [PATCH] Test

---
 .drone.yml                                    | 8 ++++++--
 utils/scripts/build/package-artifacts.ps1     | 4 ++--
 utils/scripts/build/windows-build-bots.ps1    | 6 +++---
 utils/scripts/build/windows-build-no-bots.ps1 | 6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 862360706..28b46dabb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -80,8 +80,8 @@ steps:
   - name: Package Artifacts
     image: akkadius/eqemu-server:v11
     commands:
-      - find build
-      - find build-bots
+      - find build/bin/
+      - find build-bots/bin/
     volumes:
       - name: cache
         path: /home/eqemu/.ccache/
@@ -98,6 +98,10 @@ kind: pipeline
 type: exec
 name: Build Windows Binaries
 
+# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
+concurrency:
+  limit: 1
+
 platform:
   os: windows
   arch: amd64
diff --git a/utils/scripts/build/package-artifacts.ps1 b/utils/scripts/build/package-artifacts.ps1
index ebf9709ff..cb125f127 100644
--- a/utils/scripts/build/package-artifacts.ps1
+++ b/utils/scripts/build/package-artifacts.ps1
@@ -2,6 +2,6 @@ $cwd = Get-Location
 
 Set-Location -Path "$cwd"
 
-7z a build_x64.zip $cwd\build_x64\bin\RelWithDebInfo\*.exe $cwd\build_x64\bin\RelWithDebInfo\*.dll $cwd\build_x64\bin\RelWithDebInfo\*.pdb $cwd\build_x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\build_x64\libs\zlibng\RelWithDebInfo\*.pdb
+7z a win-build-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
 
-7z a build_bots_x64.zip $cwd\build_bots_x64\bin\RelWithDebInfo\*.exe $cwd\build_bots_x64\bin\RelWithDebInfo\*.dll $cwd\build_bots_x64\bin\RelWithDebInfo\*.pdb $cwd\build_bots_x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\build_bots_x64\libs\zlibng\RelWithDebInfo\*.pdb
+7z a win-build-bots-x64.zip $cwd\win-build-bots-x64\bin\RelWithDebInfo\*.exe $cwd\win-build-bots-x64\bin\RelWithDebInfo\*.dll $cwd\win-build-bots-x64\bin\RelWithDebInfo\*.pdb $cwd\win-build-bots-x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\win-build-bots-x64\libs\zlibng\RelWithDebInfo\*.pdb
diff --git a/utils/scripts/build/windows-build-bots.ps1 b/utils/scripts/build/windows-build-bots.ps1
index 067a4d004..2e2fac826 100644
--- a/utils/scripts/build/windows-build-bots.ps1
+++ b/utils/scripts/build/windows-build-bots.ps1
@@ -2,13 +2,13 @@ $cwd = Get-Location
 
 Set-Location -Path "$cwd"
 
-if(![System.IO.Directory]::Exists("$cwd\build_bots_x64")) {
+if(![System.IO.Directory]::Exists("$cwd\win-build-bots-x64")) {
 	Write-Information -MessageData "Creating build (bots) x64 folder" -InformationAction Continue
-	New-Item -Path "$cwd\build_bots_x64" -ItemType Directory
+	New-Item -Path "$cwd\win-build-bots-x64" -ItemType Directory
 }
 
 Write-Information -MessageData "Creating bots build x64" -InformationAction Continue
-Set-Location -Path "$cwd\build_bots_x64"
+Set-Location -Path "$cwd\win-build-bots-x64"
 cmake -Wno-dev -G "Visual Studio 17 2022" -A x64 -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DEQEMU_ENABLE_BOTS=ON "$cwd"
 cmake --build . --config RelWithDebInfo --clean-first
 Set-Location -Path "$cwd"
diff --git a/utils/scripts/build/windows-build-no-bots.ps1 b/utils/scripts/build/windows-build-no-bots.ps1
index 8e79a2f07..4308e0885 100644
--- a/utils/scripts/build/windows-build-no-bots.ps1
+++ b/utils/scripts/build/windows-build-no-bots.ps1
@@ -2,13 +2,13 @@ $cwd = Get-Location
 
 Set-Location -Path "$cwd"
 
-if(![System.IO.Directory]::Exists("$cwd\build_x64")) {
+if(![System.IO.Directory]::Exists("$cwd\win-build-x64")) {
 	Write-Information -MessageData "Creating build x64 folder" -InformationAction Continue
-	New-Item -Path "$cwd\build_x64" -ItemType Directory
+	New-Item -Path "$cwd\win-build-x64" -ItemType Directory
 }
 
 Write-Information -MessageData "Creating no bots build x64" -InformationAction Continue
-Set-Location -Path "$cwd\build_x64"
+Set-Location -Path "$cwd\win-build-x64"
 cmake -Wno-dev -G "Visual Studio 17 2022" -A x64 -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DEQEMU_ENABLE_BOTS=OFF "$cwd"
 cmake --build . --config RelWithDebInfo --clean-first
 Set-Location -Path "$cwd"