From 148fd75d6cf8275dff9110c319a3fb6988fa2420 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Mon, 18 Mar 2024 15:28:09 -0400 Subject: [PATCH 1/6] Remove Caching --- .gitlab-ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff4469c5ff..ff1ee5e9e2 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,16 +6,10 @@ variables: # https://docs.gitlab.com/ee/ci/runners/configure_runners.html TRANSFER_METER_FREQUENCY: "2s" ARTIFACT_COMPRESSION_LEVEL: "fast" - CACHE_COMPRESSION_LEVEL: "fastest" - CACHE_REQUEST_TIMEOUT: 5 # Use FASTZIP for faster compression in cache and artifacts # https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags FF_USE_FASTZIP: true - # Our Variables - CACHE_DIR: "$CI_PROJECT_DIR/ccache" - CCACHE_DIR: $CACHE_DIR - #CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES clang-format: @@ -38,14 +32,6 @@ build-linux: stage: build image: suyuemu/cibuild:linux-x64 resource_group: linux-ci - cache: - key: "$CI_COMMIT_REF_NAME-ccache" - paths: - - $CACHE_DIR - before_script: - - mkdir -p $CACHE_DIR - - chmod -R 777 $CACHE_DIR - - ls -la $CACHE_DIR variables: GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_DEPTH: 1 From c5045ff036e95f31a531fddc36a4d073a5b1363e Mon Sep 17 00:00:00 2001 From: ddutchie Date: Mon, 18 Mar 2024 15:42:45 -0400 Subject: [PATCH 2/6] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2bf2c86d8c..0e06e5aa00 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ # Build directory [Bb]uild*/ doc-build/ -cmake-build*/ # Generated source files src/common/scm_rev.cpp From cb9e613a7ca4ead22e997e05d7e5a366cadb8a7a Mon Sep 17 00:00:00 2001 From: ddutchie Date: Mon, 18 Mar 2024 16:08:41 -0400 Subject: [PATCH 3/6] Update docker.sh --- .ci/scripts/linux/docker.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index b6b8efeea4..7a734a08d9 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -12,8 +12,6 @@ mkdir build || true && cd build cmake .. \ -DBoost_USE_STATIC_LIBS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DSUYU_USE_PRECOMPILED_HEADERS=OFF \ - -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \ -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ @@ -26,7 +24,6 @@ cmake .. \ -DSUYU_USE_BUNDLED_FFMPEG=ON \ -DSUYU_ENABLE_LTO=ON \ -DSUYU_CRASH_DUMPS=ON \ - -DSUYU_USE_FASTER_LD=ON \ -GNinja ninja From 07f19b0bbcb9b612c8557b06265b348933f4e326 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Mon, 18 Mar 2024 16:21:28 -0400 Subject: [PATCH 4/6] cleanup --- .gitignore | 1 - .gitlab-ci.yml | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0e06e5aa00..28a064ba6f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ dist/english_plurals/generated_en.ts .idea/ .vs/ .vscode/ -.cache/ CMakeLists.txt.user* # *nix related diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff1ee5e9e2..51891c4876 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,6 @@ stages: - format - build - -variables: - # https://docs.gitlab.com/ee/ci/runners/configure_runners.html - TRANSFER_METER_FREQUENCY: "2s" - ARTIFACT_COMPRESSION_LEVEL: "fast" - # Use FASTZIP for faster compression in cache and artifacts - # https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags - FF_USE_FASTZIP: true - - #CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES clang-format: stage: format From 4009a722999350f7d926bc0ea2ac557615aa2f26 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Mon, 18 Mar 2024 16:41:34 -0400 Subject: [PATCH 5/6] WTF --- src/core/crypto/key_manager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index 5a1943a5ce..f73559754c 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -667,6 +667,7 @@ static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_ } void KeyManager::LoadFromFile(const std::filesystem::path& file_path, int key_type) { + bool is_title_keys = false; if (!Common::FS::Exists(file_path)) { switch (key_type) { case 1: @@ -680,11 +681,14 @@ void KeyManager::LoadFromFile(const std::filesystem::path& file_path, int key_ty case 3: LOG_INFO(Crypto, "Issue with Title key file at '{}': File not found", file_path.generic_string()); + is_title_keys = true; case 4: LOG_INFO(Crypto, "Issue with Console key file at '{}': File not found", file_path.generic_string()); + is_title_keys = true; default: LOG_ERROR(Crypto, "Unknown Key Type"); + is_title_keys = true; } } @@ -1322,4 +1326,4 @@ bool KeyManager::AddTicket(const Ticket& ticket) { SetKey(S128KeyType::Titlekey, key.value(), rights_id[1], rights_id[0]); return true; } -} // namespace Core::Crypto \ No newline at end of file +} // namespace Core::Crypto From 2f2fbed1dbe205b29db7eb22cd3892cdfe0dbd5c Mon Sep 17 00:00:00 2001 From: ddutchie Date: Mon, 18 Mar 2024 16:43:27 -0400 Subject: [PATCH 6/6] Revert "WTF" This reverts commit 4009a722999350f7d926bc0ea2ac557615aa2f26. --- src/core/crypto/key_manager.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index f73559754c..5a1943a5ce 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -667,7 +667,6 @@ static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_ } void KeyManager::LoadFromFile(const std::filesystem::path& file_path, int key_type) { - bool is_title_keys = false; if (!Common::FS::Exists(file_path)) { switch (key_type) { case 1: @@ -681,14 +680,11 @@ void KeyManager::LoadFromFile(const std::filesystem::path& file_path, int key_ty case 3: LOG_INFO(Crypto, "Issue with Title key file at '{}': File not found", file_path.generic_string()); - is_title_keys = true; case 4: LOG_INFO(Crypto, "Issue with Console key file at '{}': File not found", file_path.generic_string()); - is_title_keys = true; default: LOG_ERROR(Crypto, "Unknown Key Type"); - is_title_keys = true; } } @@ -1326,4 +1322,4 @@ bool KeyManager::AddTicket(const Ticket& ticket) { SetKey(S128KeyType::Titlekey, key.value(), rights_id[1], rights_id[0]); return true; } -} // namespace Core::Crypto +} // namespace Core::Crypto \ No newline at end of file