From 012c54c2775faec26bf469e90a95a9013092b1f5 Mon Sep 17 00:00:00 2001 From: KimLS Date: Tue, 9 Dec 2025 23:01:03 -0800 Subject: [PATCH] change db update manifest to header change build yml --- .github/workflows/build.yaml | 4 ++-- common/CMakeLists.txt | 6 +++--- common/database/database_update.cpp | 7 +++---- ...base_update_manifest.cpp => database_update_manifest.h} | 2 +- ...e_manifest_bots.cpp => database_update_manifest_bots.h} | 2 +- ...nifest_custom.cpp => database_update_manifest_custom.h} | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) rename common/database/{database_update_manifest.cpp => database_update_manifest.h} (99%) rename common/database/{database_update_manifest_bots.cpp => database_update_manifest_bots.h} (99%) rename common/database/{database_update_manifest_custom.cpp => database_update_manifest_custom.h} (98%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c9650cf56..4247d5c55 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential ninja-build ccache libmariadb-dev libmariadb-dev-compat libboost-all-dev libperl-dev liblua5.1-0-dev libluajit-5.1-dev zlib1g-dev uuid-dev libssl-dev libsodium-dev libmbedtls-dev + sudo apt-get install -y build-essential ninja-build ccache - name: Configure run: | @@ -74,7 +74,7 @@ jobs: - name: Build shell: pwsh - run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m + run: cmake --build build --parallel --config RelWithDebInfo --target ALL_BUILD -- /m - name: Test working-directory: build diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index b65ab7311..b21d131fe 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -16,9 +16,6 @@ set(common_sources database/database_dump_service.cpp database.cpp database_instances.cpp - database/database_update_manifest.cpp - database/database_update_manifest_custom.cpp - database/database_update_manifest_bots.cpp database/database_update.cpp data_bucket.cpp dbcore.cpp @@ -557,6 +554,9 @@ set(common_headers database.h database_schema.h database/database_update.h + database/database_update_manifest.h + database/database_update_manifest_custom.h + database/database_update_manifest_bots.h data_bucket.cpp dbcore.h deity.h diff --git a/common/database/database_update.cpp b/common/database/database_update.cpp index d296aa92b..d1837b448 100644 --- a/common/database/database_update.cpp +++ b/common/database/database_update.cpp @@ -5,11 +5,10 @@ #include "../strings.h" #include "../rulesys.h" #include "../http/httplib.h" - -#include "database_update_manifest.cpp" -#include "database_update_manifest_custom.cpp" -#include "database_update_manifest_bots.cpp" #include "database_dump_service.h" +#include "database_update_manifest.h" +#include "database_update_manifest_custom.h" +#include "database_update_manifest_bots.h" constexpr int BREAK_LENGTH = 70; diff --git a/common/database/database_update_manifest.cpp b/common/database/database_update_manifest.h similarity index 99% rename from common/database/database_update_manifest.cpp rename to common/database/database_update_manifest.h index 15dc4a27f..6e88d0481 100644 --- a/common/database/database_update_manifest.cpp +++ b/common/database/database_update_manifest.h @@ -1,4 +1,4 @@ -#include "database_update.h" +#pragma once std::vector manifest_entries = { ManifestEntry{ diff --git a/common/database/database_update_manifest_bots.cpp b/common/database/database_update_manifest_bots.h similarity index 99% rename from common/database/database_update_manifest_bots.cpp rename to common/database/database_update_manifest_bots.h index c2da0fd70..4f492bda7 100644 --- a/common/database/database_update_manifest_bots.cpp +++ b/common/database/database_update_manifest_bots.h @@ -1,4 +1,4 @@ -#include "database_update.h" +#pragma once std::vector bot_manifest_entries = { ManifestEntry{ diff --git a/common/database/database_update_manifest_custom.cpp b/common/database/database_update_manifest_custom.h similarity index 98% rename from common/database/database_update_manifest_custom.cpp rename to common/database/database_update_manifest_custom.h index e441d600c..61bc10296 100644 --- a/common/database/database_update_manifest_custom.cpp +++ b/common/database/database_update_manifest_custom.h @@ -1,4 +1,4 @@ -#include "database_update.h" +#pragma once std::vector manifest_entries_custom = { ManifestEntry{