make DEVEL a ci env variable again

.ci/linux/build.sh

@@ -67,6 +67,11 @@ else
     export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_PRECOMPILED_HEADERS=OFF)
 fi
 
+
+if [ "$DEVEL" != "true" ]; then
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_UPDATE_CHECKER=ON)
+fi
+
 if [ "$USE_WEBENGINE" = "true" ]; then
     WEBENGINE=ON
 else

.ci/windows/build.sh

@@ -36,7 +36,8 @@ cmake .. -G Ninja \
 	-DCMAKE_EXE_LINKER_FLAGS=" /LTCG" \
     -DDYNARMIC_ENABLE_LTO=ON \
     -DYUZU_USE_BUNDLED_QT=${BUNDLE_QT:-false} \
-    -DUSE_CCACHE=${CCACHE:-false} \
+    -DUSE_CCACHE=${CCACHE:-false}  \
+    -DENABLE_UPDATE_CHECKER=${DEVEL:-true} \
     "${EXTRA_CMAKE_FLAGS[@]}" \
     "$@"
 

.github/workflows/build.yml

@@ -135,7 +135,7 @@ jobs:
           echo $GIT_TAG_NAME
 
       - name: Build
-        run: DEVEL=true ANDROID_HOME=/home/runner/sdk ./.ci/android/build.sh
+        run: ANDROID_HOME=/home/runner/sdk ./.ci/android/build.sh
         env:
           ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
           ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}

CMakeLists.txt

@@ -600,16 +600,6 @@ if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
     find_package(cpp-jwt)
 endif()
 
-if (DEFINED ENV{DEVEL})
-    if ("$ENV{DEVEL}" STREQUAL "false")
-        message(STATUS "DEVEL=false: Enabling update checker for release builds")
-        set(ENABLE_UPDATE_CHECKER ON)
-    else()
-        message(STATUS "DEVEL=$ENV{DEVEL}: Disabling updates checker for development builds")
-        set(ENABLE_UPDATE_CHECKER OFF)
-    endif()
-endif()
-
 if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
     find_package(oaknut)
 endif()

src/android/app/build.gradle.kts

@@ -229,6 +229,10 @@ android {
     defaultConfig {
         externalNativeBuild {
             cmake {
+                val enableUpdater = when (System.getenv("DEVEL")) {
+                    "false" -> "ON"
+                    else -> "OFF"
+                }
                 arguments(
                     "-DENABLE_QT=0", // Don't use QT
                     "-DENABLE_SDL2=0", // Don't use SDL
@@ -241,7 +245,8 @@ android {
                     "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
                     "-DBUILD_TESTING=OFF",
                     "-DYUZU_TESTS=OFF",
-                    "-DDYNARMIC_TESTS=OFF"
+                    "-DDYNARMIC_TESTS=OFF",
+                    "-DENABLE_UPDATE_CHECKER=$enableUpdater"
                 )
 
                 abiFilters("arm64-v8a")