CI: Build fix

stenzek · Sep 30, 2023 · 7c102ec · 7c102ec
1 parent 1611885
commit 7c102ec
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git 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/[email protected]
       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
@@ -6,6 +6,7 @@
 #include "common/small_string.h"
 #include "common/types.h"
 
+#include <mutex>
 #include <string>
 #include <utility>
 #include <vector>

diff --git 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
@@ -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
@@ -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)