Update windows-build.ps1

.drone.yml

@@ -1,43 +1,11 @@
 ---
-kind: pipeline
-type: docker
-name: EQEmulator Server Linux CI
-
-# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
-concurrency:
-  limit: 1
-
-volumes:
-  - name: cache
-    host:
-      path: /var/lib/cache-debug
-
-steps:
-  - name: server-build
-    # Source build script https://github.com/Akkadius/akk-stack/blob/master/containers/eqemu-server/Dockerfile#L20
-    image: akkadius/eqemu-server:v11
-    commands:
-      - sudo chown eqemu:eqemu /drone/src/ * -R
-      - sudo chown eqemu:eqemu /home/eqemu/.ccache/ * -R
-      - git submodule init && git submodule update && mkdir -p build && cd build && cmake -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-O0 -g -DNDEBUG" -G 'Unix Makefiles' .. && make -j$((`nproc`-4))
-      - curl https://raw.githubusercontent.com/Akkadius/eqemu-install-v2/master/eqemu_config.json --output eqemu_config.json
-      - ./bin/tests
-    volumes:
-      - name: cache
-        path: /home/eqemu/.ccache/
-
-# remove this when merge
-trigger:
-  branch:
-    - noop
-  event:
-    - push
-
----
 
 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:
@@ -49,70 +17,37 @@ volumes:
       path: /var/lib/cache-release
 
 steps:
-  - name: Init
+  - name: Build Linux X64
     image: akkadius/eqemu-server:v11
     environment:
       GITHUB_TOKEN:
         from_secret: GH_RELEASE_GITHUB_API_TOKEN
-    commands:
-      - ./utils/scripts/build/should-release/should-release
-      - sudo chown eqemu:eqemu /drone/src/ * -R
-      - sudo chown eqemu:eqemu /home/eqemu/.ccache/ * -R
-      - git submodule init && git submodule update
-    volumes:
-      - name: cache
-        path: /home/eqemu/.ccache/
-  - name: Linux x64
-    image: akkadius/eqemu-server:v11
-    commands:
-      - mkdir -p build && cd build && cmake -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-Os" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -G 'Unix Makefiles' .. && make -j$((`nproc`-4))
-      - curl https://raw.githubusercontent.com/Akkadius/eqemu-install-v2/master/eqemu_config.json --output eqemu_config.json
-      - ./bin/tests
-    volumes:
-      - name: cache
-        path: /home/eqemu/.ccache/
-  - name: Package Artifact
-    image: akkadius/eqemu-server:v11
-    commands:
-      - rm ./build/bin/*.a
-      - zip -j eqemu-server-linux-x64.zip ./build/bin/*
-      - ls -lsh | grep zip
-    volumes:
-      - name: cache
-        path: /home/eqemu/.ccache/
-  - name: Upload Artifact
-    image: akkadius/eqemu-build-releaser:v2
-    environment:
       RCLONE_CONFIG_REMOTE_TYPE: ftp
       RCLONE_FTP_HOST: drone.akkadius.com
       RCLONE_FTP_USER: artifacts
       RCLONE_FTP_PASS:
         from_secret: RCLONE_FTP_PASS
     commands:
-      - rclone config create remote ftp env_auth true > /dev/null
+      - ./utils/scripts/build/linux-build.sh
-      - |
+    volumes:
-        rclone copy eqemu-server-linux-x64.zip remote:
+      - name: cache
-      - |
+        path: /home/eqemu/.ccache/
-        rclone ls remote:
-
-trigger:
-  branch:
-    - akkadius/build-test
-  event:
-    - push
 
 ---
 
 kind: pipeline
 type: exec
-name: Build Windows Binaries
+name: Build Windows
+
+clone:
+  depth: 1
 
 platform:
   os: windows
   arch: amd64
 
 steps:
-  - name: Build Windows X64 Release
+  - name: Build Windows X64
     environment:
       RCLONE_CONFIG_REMOTE_TYPE: ftp
       RCLONE_FTP_HOST: drone.akkadius.com
@@ -124,12 +59,6 @@ steps:
     commands:
       - .\utils\scripts\build\windows-build.ps1
 
-trigger:
-  branch:
-    - akkadius/build-test
-  event:
-    - push
-
 ---
 
 kind: pipeline
@@ -159,11 +88,5 @@ steps:
         rclone delete remote: --include "eqemu-server*.zip"
 
 depends_on:
-  - Build Windows Binaries
+  - Build Windows
-  - Build Linux Binaries
+  - Build Linux
-
-trigger:
-  branch:
-    - akkadius/build-test
-  event:
-    - push

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [22.0.8]
+
+### Release Test
+
+Another release test (We're almost there!)
+
 ## [22.0.7]
 
 ### Release Test

CMakeLists.txt

@@ -23,7 +23,7 @@ IF(MSVC)
 	ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC) # for Luabind on C++17
 
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-	ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo ")
+	ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo /Os")
 ELSE(MSVC)
 	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
 ENDIF(MSVC)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eqemu-server",
-  "version": "22.0.7",
+  "version": "22.0.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/EQEmu/Server.git"

utils/scripts/build/build-release.bat

@@ -1,12 +0,0 @@
-git submodule init
-git submodule update
-.\utils\scripts\build\windows-build.ps1
-
-.\utils\scripts\build\should-release\should-release.exe || echo Not releasing, exit gracefully && exit /b 0
-
-Powershell.exe -executionpolicy remotesigned -File  .\utils\scripts\build\package-artifacts.ps1
-
-dir *.zip
-rclone config create remote ftp env_auth true
-rclone copy eqemu-server-windows-x64.zip remote:
-rclone ls remote:

utils/scripts/build/linux-build.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -x
+
+sudo chown eqemu:eqemu /drone/src/ * -R
+sudo chown eqemu:eqemu /home/eqemu/.ccache/ * -R
+
+git submodule init && git submodule update
+
+mkdir -p build && cd build && cmake -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-Os" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -G 'Unix Makefiles' .. && make -j$((`nproc`-4))
+
+curl https://raw.githubusercontent.com/Akkadius/eqemu-install-v2/master/eqemu_config.json --output eqemu_config.json
+./bin/tests
+
+# shellcheck disable=SC2164
+cd /drone/src/
+
+chmod +x ./utils/scripts/build/should-release/should-release
+./utils/scripts/build/should-release/should-release || exit
+
+rm ./build/bin/*.a
+zip -j eqemu-server-linux-x64.zip ./build/bin/*
+
+# shellcheck disable=SC2010
+ls -lsh | grep zip
+sudo apt-get update && sudo apt-get install -y rclone
+rclone config create remote ftp env_auth true > /dev/null
+rclone copy eqemu-server-linux-x64.zip remote:
+rclone ls remote:

utils/scripts/build/windows-build.ps1

@@ -1,4 +1,4 @@
-Try
+try
 {
     $cwd = Get-Location
 
@@ -19,18 +19,30 @@ 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 }
 
-    cmd.exe .\utils\scripts\build\should-release\should-release.exe
+    # trim some fat
+    del $cwd\win-build-x64\bin\RelWithDebInfo\export_client_files.pdb
+    del $cwd\win-build-x64\bin\RelWithDebInfo\import_client_files.pdb
+    del $cwd\win-build-x64\bin\RelWithDebInfo\shared_memory.pdb
+    del $cwd\win-build-x64\bin\RelWithDebInfo\queryserv.pdb
+    del $cwd\win-build-x64\bin\RelWithDebInfo\eqlaunch.pdb
+    del $cwd\win-build-x64\bin\RelWithDebInfo\cppunit.pdb
+#    del $cwd\win-build-x64\bin\RelWithDebInfo\zlib-ng.pdb
+    del $cwd\win-build-x64\bin\RelWithDebInfo\tests.pdb
+    del $cwd\win-build-x64\bin\RelWithDebInfo\tests.exe
+
+    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:
     rclone ls remote:
 }
-Catch
+catch
 {
     Write-Host ("Caught signal to end")
+    Write-Host $_
 }