Merge branch 'master' into lp2-jan-2024

# Conflicts:
#	.ci/android/build.sh
#	.ci/android/upload.sh
#	.ci/common/post-upload.sh
#	.ci/common/pre-upload.sh
#	.ci/linux-clang-format/build.sh
#	.ci/linux-clang-format/docker.sh
#	.ci/linux-fresh/build.sh
#	.ci/linux-fresh/docker.sh
#	.ci/linux-fresh/upload.sh
#	.ci/linux-frozen/build.sh
#	.ci/linux-frozen/docker.sh
#	.ci/linux-frozen/install_package.py
#	.ci/linux-mingw/build.sh
#	.ci/linux-mingw/docker.sh
#	.ci/linux-mingw/scan_dll.py
#	.ci/linux-mingw/upload.sh
#	.ci/macos/build.sh
#	.ci/macos/deps.sh
#	.ci/macos/upload.sh
#	.ci/transifex/build.sh
#	CMakeModules/MSVCCache.cmake
#	src/android/app/build.gradle
#	src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
#	src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java
#	src/android/app/src/main/res/layout/fragment_emulation.xml
#	src/android/app/src/main/res/values/arrays.xml

.ci/android.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -ex
+
+export NDK_CCACHE=$(which ccache)
+[ "$GITHUB_REPOSITORY" = "citra-emu/citra-canary" ] &&
+   BUILD_FLAVOR=canary ||
+   BUILD_FLAVOR=nightly
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+fi
+
+cd src/android
+chmod +x ./gradlew
+./gradlew assemble${BUILD_FLAVOR}Release
+./gradlew bundle${BUILD_FLAVOR}Release
+
+ccache -s -v
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    rm "${ANDROID_KEYSTORE_FILE}"
+fi

.ci/linux-clang-format/script.sh → .ci/clang-format.sh

@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis
 fi
 
 # Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-12
+CLANG_FORMAT=clang-format-15
 $CLANG_FORMAT --version
 
 if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then

.ci/ios.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -ex
+
+mkdir build && cd build
+cmake .. -GNinja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SYSTEM_NAME=iOS \
+    -DCMAKE_OSX_ARCHITECTURES=arm64 \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DENABLE_QT_TRANSLATION=ON \
+    -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
+    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
+ninja
+
+ccache -s -v