From 7c102ec29d9bb41b2ed185f2275ed01434a58cd3 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 30 Sep 2023 15:17:18 +1000 Subject: [PATCH] CI: Build fix --- .github/workflows/rolling-release.yml | 8 ++++---- src/core/achievements.h | 1 + src/duckstation-nogui/nogui_host.cpp | 2 +- src/duckstation-regtest/regtest_host.cpp | 2 +- src/updater/cocoa_main.mm | 2 -- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 538ab5e12..cbea7424f 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -281,15 +281,15 @@ jobs: - name: Generate AppStream XML run: | - scripts/generate-metainfo.sh scripts/flatpak/org.duckstation.duckstation.metainfo.xml - cat scripts/flatpak/org.duckstation.duckstation.metainfo.xml - flatpak run org.freedesktop.appstream-glib validate scripts/flatpak/org.duckstation.duckstation.metainfo.xml + scripts/generate-metainfo.sh scripts/flatpak + cat scripts/flatpak/org.duckstation.DuckStation.metainfo.xml + flatpak run org.freedesktop.appstream-glib validate scripts/flatpak/org.duckstation.DuckStation.metainfo.xml - name: Build Flatpak uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1 with: bundle: duckstation-x64.flatpak - manifest-path: scripts/flatpak/org.duckstation.duckstation.json + manifest-path: scripts/flatpak/org.duckstation.DuckStation.json arch: x86_64 build-bundle: true verbose: true diff --git a/src/core/achievements.h b/src/core/achievements.h index f12ee95da..51a527fa1 100644 --- a/src/core/achievements.h +++ b/src/core/achievements.h @@ -6,6 +6,7 @@ #include "common/small_string.h" #include "common/types.h" +#include #include #include #include diff --git a/src/duckstation-nogui/nogui_host.cpp b/src/duckstation-nogui/nogui_host.cpp index 16318901a..cc039a05f 100644 --- a/src/duckstation-nogui/nogui_host.cpp +++ b/src/duckstation-nogui/nogui_host.cpp @@ -263,7 +263,7 @@ bool NoGUIHost::InitializeConfig(std::string settings_filename) if (!Log::IsConsoleOutputEnabled() && s_base_settings_interface->GetBoolValue("Logging", "LogToConsole", Settings::DEFAULT_LOG_TO_CONSOLE)) { - Log::SetConsoleOutputParams(true, nullptr, LOGLEVEL_NONE); + Log::SetConsoleOutputParams(true, s_base_settings_interface->GetBoolValue("Logging", "LogTimestamps", true)); } return true; diff --git a/src/duckstation-regtest/regtest_host.cpp b/src/duckstation-regtest/regtest_host.cpp index cc957ee2b..5688d4360 100644 --- a/src/duckstation-regtest/regtest_host.cpp +++ b/src/duckstation-regtest/regtest_host.cpp @@ -505,7 +505,7 @@ bool RegTestHost::ParseCommandLineParameters(int argc, char* argv[], std::option return false; } - Log::SetConsoleOutputParams(true, nullptr, level.value()); + Log::SetConsoleOutputParams(true, level.value()); s_base_settings_interface->SetStringValue("Logging", "LogLevel", Settings::GetLogLevelName(level.value())); continue; } diff --git a/src/updater/cocoa_main.mm b/src/updater/cocoa_main.mm index b4f57b90a..8ba581e5d 100644 --- a/src/updater/cocoa_main.mm +++ b/src/updater/cocoa_main.mm @@ -33,8 +33,6 @@ int main(int argc, char* argv[]) const ProcessSerialNumber psn = {0, kCurrentProcess}; TransformProcessType(&psn, kProcessTransformToForegroundApplication); - Log::SetConsoleOutputParams(true, "", LOGLEVEL_DEBUG); - CocoaProgressCallback progress; if (argc != 4)