From b2a3f12640bc29e0967cfbf91e8f78eb01bd6423 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 12 Mar 2025 10:30:02 -0400 Subject: [PATCH 1/2] Only enable update checker on internal builds Signed-off-by: Isaac Marovitz --- .github/workflows/validate-internal.yml | 2 ++ .github/workflows/validate.yml | 8 ++++++-- UnleashedRecomp/CMakeLists.txt | 6 ++++++ UnleashedRecomp/install/update_checker.cpp | 6 ++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-internal.yml b/.github/workflows/validate-internal.yml index b5eb23a..aa46c39 100644 --- a/.github/workflows/validate-internal.yml +++ b/.github/workflows/validate-internal.yml @@ -10,3 +10,5 @@ jobs: if: github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name uses: ./.github/workflows/validate.yml secrets: inherit + with: + cmake-flags: "-DUNLEASHED_RECOMP_CHECK_FOR_UPDATES=ON" diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 9027616..e656985 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -6,6 +6,10 @@ on: required: true ASSET_REPO_TOKEN: required: true + inputs: + cmake-flags: + required: false + type: string concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -66,7 +70,7 @@ jobs: - name: Configure Project env: CCACHE_DIR: /tmp/ccache - run: cmake . --preset ${{ env.CMAKE_PRESET }} -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache + run: cmake . --preset ${{ env.CMAKE_PRESET }} -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache ${{ inputs.cmake-flags }} - name: Build Project env: @@ -130,7 +134,7 @@ jobs: copy .\private\* .\UnleashedRecompLib\private - name: Configure Project - run: cmake . --preset ${{ env.CMAKE_PRESET }} -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache + run: cmake . --preset ${{ env.CMAKE_PRESET }} -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache ${{ inputs.cmake-flags }} - name: Build Project run: cmake --build .\out\build\${{ env.CMAKE_PRESET }} --target UnleashedRecomp diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt index 66b60a4..07b61f8 100644 --- a/UnleashedRecomp/CMakeLists.txt +++ b/UnleashedRecomp/CMakeLists.txt @@ -8,6 +8,8 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux") option(UNLEASHED_RECOMP_FLATPAK "Configure the build for Flatpak compatibility." OFF) endif() +option(UNLEASHED_RECOMP_CHECK_FOR_UPDATES "Enables the update checker." OFF) + function(BIN2C) cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_NAME;COMPRESSION_TYPE" "" ${ARGN}) @@ -317,6 +319,10 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux") target_compile_definitions(UnleashedRecomp PRIVATE SDL_VULKAN_ENABLED) endif() +if (UNLEASHED_RECOMP_CHECK_FOR_UPDATES) + target_compile_definitions(UnleashedRecomp PRIVATE -DCHECK_FOR_UPDATES) +endif() + find_package(directx-dxc REQUIRED) find_package(CURL REQUIRED) diff --git a/UnleashedRecomp/install/update_checker.cpp b/UnleashedRecomp/install/update_checker.cpp index 706a0e0..c733191 100644 --- a/UnleashedRecomp/install/update_checker.cpp +++ b/UnleashedRecomp/install/update_checker.cpp @@ -130,6 +130,7 @@ void UpdateChecker::initialize() bool UpdateChecker::start() { +#ifdef CHECK_FOR_UPDATES if (g_updateCheckerInProgress) { return false; @@ -139,12 +140,14 @@ bool UpdateChecker::start() g_updateCheckerFinished = false; std::thread thread(&updateCheckerThread); thread.detach(); +#endif return true; } UpdateChecker::Result UpdateChecker::check() { +#ifdef CHECK_FOR_UPDATES if (g_updateCheckerFinished) { return g_updateCheckerResult; @@ -157,6 +160,9 @@ UpdateChecker::Result UpdateChecker::check() { return UpdateChecker::Result::NotStarted; } +#endif + + return = UpdateChecker::Result::AlreadyUpToDate; } void UpdateChecker::visitWebsite() From e86e9165510d7ecb6bd6d1c3b8fe2c699b1bba3b Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 12 Mar 2025 10:32:02 -0400 Subject: [PATCH 2/2] Fix typo Signed-off-by: Isaac Marovitz --- UnleashedRecomp/install/update_checker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnleashedRecomp/install/update_checker.cpp b/UnleashedRecomp/install/update_checker.cpp index c733191..8efc9a8 100644 --- a/UnleashedRecomp/install/update_checker.cpp +++ b/UnleashedRecomp/install/update_checker.cpp @@ -162,7 +162,7 @@ UpdateChecker::Result UpdateChecker::check() } #endif - return = UpdateChecker::Result::AlreadyUpToDate; + return UpdateChecker::Result::AlreadyUpToDate; } void UpdateChecker::visitWebsite()