Skip to content

Only enable update checker on internal builds #1345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IsaacMarovitz wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Only enable update checker on internal builds #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2a3f12
Only enable update checker on internal builds
IsaacMarovitz Mar 12, 2025
e86e916
Fix typo
IsaacMarovitz Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/validate-internal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 6 additions & 2 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions UnleashedRecomp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down Expand Up @@ -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)

Expand Down
6 changes: 6 additions & 0 deletions UnleashedRecomp/install/update_checker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ void UpdateChecker::initialize()

bool UpdateChecker::start()
{
#ifdef CHECK_FOR_UPDATES
if (g_updateCheckerInProgress)
{
return false;
Expand All @@ -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;
Expand All @@ -157,6 +160,9 @@ UpdateChecker::Result UpdateChecker::check()
{
return UpdateChecker::Result::NotStarted;
}
#endif

return UpdateChecker::Result::AlreadyUpToDate;
}

void UpdateChecker::visitWebsite()
Expand Down
Loading