From 26116ec8087ece03b16d355dbb5665a2d1d980f8 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Wed, 18 Jan 2023 23:00:46 -0600 Subject: [PATCH] Release without bots --- .drone.yml | 21 ++----------------- CHANGELOG.md | 6 ++++++ package.json | 2 +- utils/scripts/build/package-artifacts.ps1 | 1 - utils/scripts/build/windows-build-bots.ps1 | 14 ------------- ...ws-build-no-bots.ps1 => windows-build.ps1} | 4 ++-- 6 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 utils/scripts/build/windows-build-bots.ps1 rename utils/scripts/build/{windows-build-no-bots.ps1 => windows-build.ps1} (71%) diff --git a/.drone.yml b/.drone.yml index 9295664aa..eed374c14 100644 --- a/.drone.yml +++ b/.drone.yml @@ -68,20 +68,10 @@ steps: volumes: - name: cache path: /home/eqemu/.ccache/ - - name: Linux x64 Bots - image: akkadius/eqemu-server:v11 - commands: - - git submodule init && git submodule update && mkdir -p build-bots && cd build-bots && cmake -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_ENABLE_BOTS=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/ - name: Package Artifacts image: akkadius/eqemu-server:v11 commands: - 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 @@ -98,8 +88,6 @@ steps: - rclone config create remote ftp env_auth true > /dev/null - | rclone copy eqemu-server-linux-x64.zip remote: - - | - rclone copy eqemu-server-linux-bots-x64.zip remote: - | rclone ls remote: @@ -126,10 +114,7 @@ steps: - git submodule update - name: Windows x64 commands: - - utils/scripts/build/windows-build-no-bots.ps1 - - name: Windows x64 Bots - commands: - - utils/scripts/build/windows-build-bots.ps1 + - utils/scripts/build/windows-build.ps1 - name: Package Artifacts commands: - utils/scripts/build/package-artifacts.ps1 @@ -145,8 +130,6 @@ steps: - rclone config create remote ftp env_auth true - | rclone copy eqemu-server-windows-x64.zip remote: - - | - rclone copy eqemu-server-windows-bots-x64.zip remote: - | rclone ls remote: @@ -177,7 +160,7 @@ steps: - rclone config create remote ftp env_auth true > /dev/null - | rclone copy remote: --include "eqemu-server*.zip" . - - gh-release --assets=eqemu-server-linux-x64.zip,eqemu-server-linux-bots-x64.zip,eqemu-server-windows-x64.zip,eqemu-server-windows-bots-x64.zip -y + - gh-release --assets=eqemu-server-linux-x64.zip,eqemu-server-windows-x64.zip -y #depends_on: # - Build Windows Binaries diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c07c2174..932f6c3c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [22.0.2] + +### Release Without Bots + +Testing release without bots + ## [22.0.1] ### Stable Releases diff --git a/package.json b/package.json index d3f506559..a5547dcf3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eqemu-server", - "version": "22.0.1", + "version": "22.0.2", "repository": { "type": "git", "url": "https://github.com/EQEmu/Server.git" diff --git a/utils/scripts/build/package-artifacts.ps1 b/utils/scripts/build/package-artifacts.ps1 index 1b0a4636b..cc2438d52 100644 --- a/utils/scripts/build/package-artifacts.ps1 +++ b/utils/scripts/build/package-artifacts.ps1 @@ -3,4 +3,3 @@ $cwd = Get-Location 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 -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 diff --git a/utils/scripts/build/windows-build-bots.ps1 b/utils/scripts/build/windows-build-bots.ps1 deleted file mode 100644 index 2e2fac826..000000000 --- a/utils/scripts/build/windows-build-bots.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -$cwd = Get-Location - -Set-Location -Path "$cwd" - -if(![System.IO.Directory]::Exists("$cwd\win-build-bots-x64")) { - Write-Information -MessageData "Creating build (bots) x64 folder" -InformationAction Continue - New-Item -Path "$cwd\win-build-bots-x64" -ItemType Directory -} - -Write-Information -MessageData "Creating bots build x64" -InformationAction Continue -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.ps1 similarity index 71% rename from utils/scripts/build/windows-build-no-bots.ps1 rename to utils/scripts/build/windows-build.ps1 index 4308e0885..dc64ad4ca 100644 --- a/utils/scripts/build/windows-build-no-bots.ps1 +++ b/utils/scripts/build/windows-build.ps1 @@ -7,8 +7,8 @@ if(![System.IO.Directory]::Exists("$cwd\win-build-x64")) { New-Item -Path "$cwd\win-build-x64" -ItemType Directory } -Write-Information -MessageData "Creating no bots build x64" -InformationAction Continue +Write-Information -MessageData "Creating build x64" -InformationAction Continue 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 -Wno-dev -G "Visual Studio 17 2022" -A x64 -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON "$cwd" cmake --build . --config RelWithDebInfo --clean-first Set-Location -Path "$cwd"