Release/beta

.github/workflows/deploy-android.yml

@@ -17,6 +17,11 @@ name: Deploy Android + Android TV (Google Play)
 
 on:
   workflow_dispatch:
+    inputs:
+      build_apk:
+        description: "APK-only: build a sideloadable test APK artifact and SKIP the Google Play publish"
+        type: boolean
+        default: false
   workflow_call:
     outputs:
       chiaki_version:
@@ -122,16 +127,62 @@ jobs:
             echo "No signing — unsigned build only"
           fi
 
+      # Skipped on APK-only runs (build_apk checkbox): those just want a sideloadable
+      # APK and must not touch Google Play.
       - name: Build release AAB
         id: bundle_release
+        if: ${{ !inputs.build_apk }}
         working-directory: android
         run: |
           ./gradlew bundleRelease \
             --parallel \
             --build-cache \
             -Dorg.gradle.java.home="$JAVA_HOME"
 
+      # Optional sideloadable APK. The AAB above can only go through Google Play,
+      # so this opt-in step (the "build_apk" checkbox on a manual run) produces an
+      # installable .apk testers can grab from the run's Artifacts. A signed release
+      # APK is built when signing is configured; otherwise a debug APK (still
+      # installable, self-signed) so the step never fails for lack of secrets.
+      - name: Build sideloadable APK
+        id: build_apk
+        if: ${{ inputs.build_apk }}
+        working-directory: android
+        run: |
+          # Plain assemble (NO android.injected.build.* properties): those mark the APK
+          # testOnly=true, which blocks normal sideloading (INSTALL_FAILED_TEST_ONLY / "can't
+          # install on this device"). abiFilters in build.gradle already limits native libs to the
+          # ABIs that were built (arm64-v8a), so this stays effectively arm64 while remaining
+          # installable from a file manager / the Downloads folder.
+          if [ "$SIGNING_CONFIGURED" = "true" ]; then
+            echo "Signing configured — building signed release APK"
+            ./gradlew assembleRelease \
+              --parallel --build-cache -Dorg.gradle.java.home="$JAVA_HOME"
+          else
+            echo "::warning::No signing configured — building debug APK (self-signed, still installable for testing)"
+            ./gradlew assembleDebug \
+              --parallel --build-cache -Dorg.gradle.java.home="$JAVA_HOME"
+          fi
+          # Newest final APK from the outputs dir (outputs/ only, so we never pick an intermediate
+          # unsigned APK). xargs -r so an empty find doesn't run `ls` on the cwd and yield a bogus path.
+          APK="$(find app/build/outputs/apk -name '*.apk' -print0 2>/dev/null | xargs -0 -r ls -t 2>/dev/null | head -1)"
+          test -n "$APK" || { echo "::error::No APK produced"; exit 1; }
+          SHORT_SHA="$(git rev-parse --short HEAD)"
+          DEST="pylux-${{ steps.extract_version.outputs.version }}-${SHORT_SHA}.apk"
+          cp "$APK" "$GITHUB_WORKSPACE/$DEST"
+          echo "apk_name=$DEST" >> "$GITHUB_OUTPUT"
+          echo "Built sideloadable APK: $DEST"
+
+      - name: Upload APK artifact
+        if: ${{ inputs.build_apk }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: pylux-android-apk
+          path: ${{ steps.build_apk.outputs.apk_name }}
+          if-no-files-found: error
+
       - name: Decode Google Play service account key
+        if: ${{ !inputs.build_apk }}
         env:
           JSON_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_BASE64 }}
         run: |
@@ -148,7 +199,7 @@ jobs:
           fi
 
       - name: Determine Google Play track
-        if: env.UPLOAD_ENABLED == 'true'
+        if: ${{ env.UPLOAD_ENABLED == 'true' && !inputs.build_apk }}
         run: |
           if [ "${{ github.ref_name }}" = "master" ]; then
             TRACK=production
@@ -160,7 +211,7 @@ jobs:
 
       - name: Upload AAB to Google Play
         id: upload_play
-        if: env.UPLOAD_ENABLED == 'true'
+        if: ${{ env.UPLOAD_ENABLED == 'true' && !inputs.build_apk }}
         working-directory: android
         env:
           # Same value Gradle uses (extract-version semver_build_id); avoids Fastlane relying on a solo Gradle invoke.
@@ -177,7 +228,15 @@ jobs:
           {
             echo "## Pylux Android — v${CHIAKI_VERSION:-?}"
             echo ""
-            if [ "${{ steps.bundle_release.outcome }}" = "skipped" ] || [ "${{ steps.bundle_release.outcome }}" != "success" ]; then
+            if [ "${{ inputs.build_apk }}" = "true" ]; then
+              echo "APK-only run — Google Play publish was skipped."
+              echo ""
+              if [ "${{ steps.build_apk.outcome }}" = "success" ]; then
+                echo "Sideloadable test APK \`${{ steps.build_apk.outputs.apk_name }}\` is attached to this run (see the **Artifacts** section, named \`pylux-android-apk\`)."
+              else
+                echo "APK build did not complete (outcome: **${{ steps.build_apk.outcome }}**). Check the logs above for details."
+              fi
+            elif [ "${{ steps.bundle_release.outcome }}" != "success" ]; then
               echo "Build did not complete (outcome: **${{ steps.bundle_release.outcome }}**). Check the logs above for details."
             else
               case "${UPLOAD_ENABLED:-false}" in

.github/workflows/deploy-macos.yml

@@ -154,6 +154,24 @@ jobs:
 
           ln -sf libvulkan.1.dylib build/gui/chiaki.app/Contents/Frameworks/vulkan 2>/dev/null || true
 
+          # Bundle SDL3 for sdl2-compat. Homebrew's `sdl2` (installed above) is now sdl2-compat -- an
+          # SDL2 API shim that dlopens SDL3 at runtime via @loader_path/libSDL3.dylib (next to libSDL2
+          # in Frameworks). macdeployqt does NOT copy SDL3 (it is loaded via dlopen, not linked), so
+          # without this the App Store .app aborts on launch with "Failed loading SDL3 library" before
+          # any of our code runs. It MUST be named libSDL3.dylib (the @loader_path name) -- not
+          # libSDL3.0.dylib, which only sdl2-compat's bare-name fallback (system search path) finds,
+          # masking the bug on dev machines. The per-arch copy is lipo-merged into the universal
+          # bundle in the create-appstore-pkg job and signed there with the rest of the dylibs.
+          SDL3_SRC="${{ matrix.brew_prefix }}/opt/sdl3/lib/libSDL3.0.dylib"
+          if [ -f "$SDL3_SRC" ]; then
+            echo "Bundling SDL3 (required by sdl2-compat)..."
+            cp -f "$SDL3_SRC" build/gui/chiaki.app/Contents/Frameworks/libSDL3.dylib
+            chmod u+w build/gui/chiaki.app/Contents/Frameworks/libSDL3.dylib
+            install_name_tool -id "@rpath/libSDL3.dylib" build/gui/chiaki.app/Contents/Frameworks/libSDL3.dylib
+          else
+            echo "::warning::SDL3 not found at $SDL3_SRC -- if libSDL2 is sdl2-compat the app will crash on launch"
+          fi
+
       - name: Create tarball for PKG job (cache, not workflow artifact)
         run: |
           cd build/gui

.gitignore

@@ -87,3 +87,4 @@ macos/fastlane/report.xml
 # Local Flatpak testing (throwaway, never commit)
 scripts/flatpak/test-flatpak-local.sh
 pylux-test.flatpak
+lib/test_cloudcatalog/.npsso

CMakeLists.txt

@@ -74,7 +74,7 @@ tri_option(CHIAKI_USE_SYSTEM_CURL "Use system-provided curl instead of submodule
 # CI injects real values from the CHIAKI_VERSION_* lines below at archive time (.github/workflows/deploy-ios.yml).
 set(CHIAKI_VERSION_MAJOR 2)
 set(CHIAKI_VERSION_MINOR 10)
-set(CHIAKI_VERSION_PATCH 21)
+set(CHIAKI_VERSION_PATCH 22)
 set(CHIAKI_VERSION ${CHIAKI_VERSION_MAJOR}.${CHIAKI_VERSION_MINOR}.${CHIAKI_VERSION_PATCH})
 
 configure_file(

android/app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
 
         <activity android:name="com.metallic.chiaki.main.MainActivity"
             android:exported="true"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />