From 16ff75c20feded75acda93317fe0dfa41b3210e4 Mon Sep 17 00:00:00 2001 From: tooomm Date: Fri, 24 Jul 2026 14:12:20 +0200 Subject: [PATCH] disable ccache if not explicitly enabled --- .ci/compile.sh | 3 +++ .github/workflows/desktop-build.yml | 1 - servatrice/check_schema_version.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index 75e929954..e577e11dd 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -124,6 +124,9 @@ set -e # Setup ./servatrice/check_schema_version.sh +if [[ ! $USE_CCACHE ]]; then + USE_CCACHE=0 +fi if [[ ! $BUILDTYPE ]]; then BUILDTYPE=Release fi diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index c19eddb88..9f1f051b0 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -325,7 +325,6 @@ jobs: qt_version: 6.11.0 qt_modules: qtimageformats qtmultimedia qtwebsockets type: Release - use_ccache: 0 name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} needs: configure diff --git a/servatrice/check_schema_version.sh b/servatrice/check_schema_version.sh index c4aadf356..8b645b5d2 100755 --- a/servatrice/check_schema_version.sh +++ b/servatrice/check_schema_version.sh @@ -10,7 +10,7 @@ declare -i schema_ver="${version_line%%)*}" latest_migration="$(ls -1 servatrice/migrations/ | tail -n1)" xtoysql="${latest_migration#servatrice_}" xtoy="${xtoysql%.sql}" -declare -i old_ver="10#${xtoy%_to_*}" #declare as integer with base 10, numbers with a leading 0 are normally interpreted as base 16 +declare -i old_ver="10#${xtoy%_to_*}" # declare as integer with base 10, numbers with a leading 0 are normally interpreted as base 16 declare -i new_ver="10#${xtoy#*_to_}" if ((old_ver >= new_ver)); then