ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: Build fix

This commit is contained in:
Stenzek 2023-09-30 15:17:18 +10:00
parent 1611885c12
commit 7c102ec29d
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/rolling-release.yml vendored
View File

@ -281,15 +281,15 @@ jobs:
- name: Generate AppStream XML - name: Generate AppStream XML
run: | run: |
scripts/generate-metainfo.sh scripts/flatpak/org.duckstation.duckstation.metainfo.xml scripts/generate-metainfo.sh scripts/flatpak
cat 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 flatpak run org.freedesktop.appstream-glib validate scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
- name: Build Flatpak - name: Build Flatpak
uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1 uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
with: with:
bundle: duckstation-x64.flatpak bundle: duckstation-x64.flatpak
manifest-path: scripts/flatpak/org.duckstation.duckstation.json manifest-path: scripts/flatpak/org.duckstation.DuckStation.json
arch: x86_64 arch: x86_64
build-bundle: true build-bundle: true
verbose: true verbose: true

1
src/core/achievements.h
View File

@ -6,6 +6,7 @@
#include "common/small_string.h" #include "common/small_string.h"
#include "common/types.h" #include "common/types.h"
#include <mutex>
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>

2
src/duckstation-nogui/nogui_host.cpp
View File

@ -263,7 +263,7 @@ bool NoGUIHost::InitializeConfig(std::string settings_filename)
if (!Log::IsConsoleOutputEnabled() && if (!Log::IsConsoleOutputEnabled() &&
s_base_settings_interface->GetBoolValue("Logging", "LogToConsole", Settings::DEFAULT_LOG_TO_CONSOLE)) 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; return true;

2
src/duckstation-regtest/regtest_host.cpp
View File

@ -505,7 +505,7 @@ bool RegTestHost::ParseCommandLineParameters(int argc, char* argv[], std::option
return false; return false;
} }
Log::SetConsoleOutputParams(true, nullptr, level.value()); Log::SetConsoleOutputParams(true, level.value());
s_base_settings_interface->SetStringValue("Logging", "LogLevel", Settings::GetLogLevelName(level.value())); s_base_settings_interface->SetStringValue("Logging", "LogLevel", Settings::GetLogLevelName(level.value()));
continue; continue;
} }

2
src/updater/cocoa_main.mm
View File

@ -33,8 +33,6 @@ int main(int argc, char* argv[])
const ProcessSerialNumber psn = {0, kCurrentProcess}; const ProcessSerialNumber psn = {0, kCurrentProcess};
TransformProcessType(&psn, kProcessTransformToForegroundApplication); TransformProcessType(&psn, kProcessTransformToForegroundApplication);
Log::SetConsoleOutputParams(true, "", LOGLEVEL_DEBUG);
CocoaProgressCallback progress; CocoaProgressCallback progress;
if (argc != 4) if (argc != 4)