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

---
 .drone.yml                                | 11 +++--------
 utils/scripts/build/package-artifacts.ps1 |  5 ++---
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8524e9ac7..18dbae94d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -80,10 +80,8 @@ steps:
   - name: Package Artifacts
     image: akkadius/eqemu-server:v11
     commands:
-      - find build/bin/
-      - find build-bots/bin/
-      - zip -j linux-build-x64.zip ./build/bin/*
-      - zip -j linux-build-bots-x64.zip ./build-bots/bin/*
+      - zip -j eqemu-server-linux-x64.zip ./build/bin/*
+      - zip -j eqemu-server-linux-bots-x64.zip ./build-bots/bin/*
       - ls -lsh | grep zip
     volumes:
       - name: cache
@@ -101,9 +99,6 @@ 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
@@ -123,7 +118,7 @@ steps:
   - name: package-artifacts
     commands:
       - utils/scripts/build/package-artifacts.ps1
-      - dir *
+      - dir *.zip
 
 trigger:
   branch:
diff --git a/utils/scripts/build/package-artifacts.ps1 b/utils/scripts/build/package-artifacts.ps1
index cb125f127..1b0a4636b 100644
--- a/utils/scripts/build/package-artifacts.ps1
+++ b/utils/scripts/build/package-artifacts.ps1
@@ -2,6 +2,5 @@ $cwd = Get-Location
 
 Set-Location -Path "$cwd"
 
-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 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
+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
+7z a eqemu-server-windows-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