BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix workflows to make release builds (#202)

Browse Source 
Currently the Windows workflow doesn't properly create a release binary.
This commit is contained in:
Lion 2023-12-09 20:17:10 +01:00 committed by GitHub
commit 43b1b050e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/linux.yml vendored
View File

@ -4,6 +4,7 @@ on: [push]
env: env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
CMAKE_BUILD_TYPE: "Release"
jobs: jobs:
debian-11-build: debian-11-build:

5
.github/workflows/release.yml vendored
View File

@ -7,6 +7,7 @@ on:
env: env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
CMAKE_BUILD_TYPE: "Release"
jobs: jobs:
create-release: create-release:
@ -27,7 +28,7 @@ jobs:
prerelease: true prerelease: true
body: | body: |
Files included in this release: Files included in this release:
- `BeamMP-Server.exe` is the windows build. - `BeamMP-Server.exe` is the windows build. You need to install the [Visual C++ Redistributables](https://aka.ms/vs/17/release/vc_redist.x64.exe) to run this.
- `BeamMP-Server-debian` is a Debian 11 build, requires `liblua5.3-0`. - `BeamMP-Server-debian` is a Debian 11 build, requires `liblua5.3-0`.
- `BeamMP-Server-ubuntu` is a Ubuntu 22.04 build, requires `liblua5.3-0`. - `BeamMP-Server-ubuntu` is a Ubuntu 22.04 build, requires `liblua5.3-0`.
@ -163,6 +164,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.create-release.outputs.upload_url }} upload_url: ${{ needs.create-release.outputs.upload_url }}
asset_path: ./bin/BeamMP-Server.exe asset_path: ./bin/Release/BeamMP-Server.exe
asset_name: BeamMP-Server.exe asset_name: BeamMP-Server.exe
asset_content_type: application/vnd.microsoft.portable-executable asset_content_type: application/vnd.microsoft.portable-executable

3
.github/workflows/windows.yml vendored
View File

@ -5,6 +5,7 @@ on: [push]
env: env:
VCPKG_DEFAULT_TRIPLET: x64-windows-static VCPKG_DEFAULT_TRIPLET: x64-windows-static
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
CMAKE_BUILD_TYPE: "Release"
jobs: jobs:
windows-build: windows-build:
@ -38,5 +39,5 @@ jobs:
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: BeamMP-Server-windows name: BeamMP-Server-windows
path: ./bin/BeamMP-Server.exe path: ./bin/Release/BeamMP-Server.exe

7
CMakeLists.txt
View File

@ -126,9 +126,10 @@ include(FindThreads)
# enables compile_commands.json for clang-related tools (such as the clang LS) # enables compile_commands.json for clang-related tools (such as the clang LS)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# build debug builds by default (if not specified otherwise) # build release builds by default (if not specified otherwise)
if(NOT CMAKE_BUILD_TYPE) if(NOT DEFINED CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug") message(NOTICE "No build type specified, defaulting to 'Release'")
set(CMAKE_BUILD_TYPE "Release")
endif() endif()
if(UNIX) if(UNIX)

2
include/Common.h
View File

@ -135,7 +135,7 @@ private:
static inline std::mutex mShutdownHandlersMutex {}; static inline std::mutex mShutdownHandlersMutex {};
static inline std::deque<TShutdownHandler> mShutdownHandlers {}; static inline std::deque<TShutdownHandler> mShutdownHandlers {};
static inline Version mVersion { 3, 1, 2 }; static inline Version mVersion { 3, 1, 3 };
}; };
std::string ThreadName(bool DebugModeOverride = false); std::string ThreadName(bool DebugModeOverride = false);

2
scripts/windows/2-build.sh
View File

@ -2,4 +2,4 @@
set -ex set -ex
cmake --build bin --parallel -t BeamMP-Server cmake --build bin --parallel -t BeamMP-Server --config Release