From 43c5eacfe78ed4ac5444e72f5e83200e61a1a05f Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Tue, 19 Mar 2024 23:40:03 +0300
Subject: [PATCH 01/14] ```-x-```

Create eaRelease Builder simple file
---
 .ci/scripts/android/eaReleasebuild.sh | 33 +++++++++++++++++++++++++++
 .ci/scripts/android/eaupload.sh       | 22 ++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 .ci/scripts/android/eaReleasebuild.sh
 create mode 100644 .ci/scripts/android/eaupload.sh

diff --git a/.ci/scripts/android/eaReleasebuild.sh b/.ci/scripts/android/eaReleasebuild.sh
new file mode 100644
index 000000000..d0cfa8c56
--- /dev/null
+++ b/.ci/scripts/android/eaReleasebuild.sh
@@ -0,0 +1,33 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+export NDK_CCACHE="$(which ccache)"
+ccache -s
+
+BUILD_FLAVOR="ea"
+
+BUILD_TYPE="release"
+if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
+    BUILD_TYPE="relWithDebInfo"
+fi
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+    base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+    export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
+    export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
+    export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
+    base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
+fi
+
+cd src/android
+chmod +x ./gradlew
+./gradlew "assemble${BUILD_FLAVOR}${BUILD_TYPE}" "bundle${BUILD_FLAVOR}${BUILD_TYPE}"
+
+ccache -s
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    rm "${ANDROID_KEYSTORE_FILE}"
+fi
diff --git a/.ci/scripts/android/eaupload.sh b/.ci/scripts/android/eaupload.sh
new file mode 100644
index 000000000..736bc3b17
--- /dev/null
+++ b/.ci/scripts/android/eaupload.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+. ./.ci/scripts/common/pre-upload.sh
+
+REV_NAME="yuzu-${GITDATE}-${GITREV}"
+
+BUILD_FLAVOR="ea"
+
+BUILD_TYPE_LOWER="release"
+BUILD_TYPE_UPPER="Release"
+if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
+    BUILD_TYPE_LOWER="relWithDebInfo"
+    BUILD_TYPE_UPPER="RelWithDebInfo"
+fi
+
+cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/${BUILD_TYPE_LOWER}/app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.apk" \
+  "artifacts/${REV_NAME}.apk"
+cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}${BUILD_TYPE_UPPER}"/"app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.aab" \
+  "artifacts/${REV_NAME}.aab"

From 8f5b9d4dae4b6765e2fbcec2b785ee1d37188501 Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 00:33:37 +0300
Subject: [PATCH 02/14] ```-x-```

ea and mainline
---
 .github/workflows/android-ea-play-release.yml       | 5 -----
 .github/workflows/android-mainline-play-release.yml | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/.github/workflows/android-ea-play-release.yml b/.github/workflows/android-ea-play-release.yml
index 0cf78279c..18f08cfbd 100644
--- a/.github/workflows/android-ea-play-release.yml
+++ b/.github/workflows/android-ea-play-release.yml
@@ -5,11 +5,6 @@ name: yuzu-android-ea-play-release
 
 on:
   workflow_dispatch:
-    inputs:
-      release-track:
-        description: 'Play store release track (internal/alpha/beta/production)'
-        required: true
-        default: 'alpha'
 
 jobs:
   android:
diff --git a/.github/workflows/android-mainline-play-release.yml b/.github/workflows/android-mainline-play-release.yml
index 8255e0a40..74bf3abd9 100644
--- a/.github/workflows/android-mainline-play-release.yml
+++ b/.github/workflows/android-mainline-play-release.yml
@@ -5,15 +5,6 @@ name: yuzu-android-mainline-play-release
 
 on:
   workflow_dispatch:
-    inputs:
-      release-tag:
-        description: 'Tag # from yuzu-android that you want to build and publish'
-        required: true
-        default: '200'
-      release-track:
-        description: 'Play store release track (internal/alpha/beta/production)'
-        required: true
-        default: 'alpha'
 
 jobs:
   android:

From 2f6f874b1df53e07d1969a5701e9a9e9d5781a13 Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 00:48:32 +0300
Subject: [PATCH 03/14] ```-x-```

test update
---
 .github/workflows/android-ea-play-release.yml |  16 +-
 .../android-mainline-play-release.yml         |   7 +
 .github/workflows/verify.yml                  | 161 +++++-------------
 3 files changed, 55 insertions(+), 129 deletions(-)

diff --git a/.github/workflows/android-ea-play-release.yml b/.github/workflows/android-ea-play-release.yml
index 18f08cfbd..ae9cf5ccd 100644
--- a/.github/workflows/android-ea-play-release.yml
+++ b/.github/workflows/android-ea-play-release.yml
@@ -41,7 +41,8 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
       - name: Build
-        run: ./.ci/scripts/android/eabuild.sh
+        run: ./.ci/scripts/android/eaReleasebuild.sh
+      - name: Copy and sign artifacts
         env:
           EA_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
           PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
@@ -50,12 +51,9 @@ jobs:
           STORE_TRACK: ${{ github.event.inputs.release-track }}
           AUTO_VERSIONED: true
           BUILD_EA: true
-      - name: Create release
-        uses: softprops/action-gh-release@v1
+        run: ./.ci/scripts/android/eaupload.sh
+      - name: Upload
+        uses: actions/upload-artifact@v4
         with:
-          tag_name: ${{ env.EA_TAG_NAME }}
-          name: ${{ env.EA_TAG_NAME }}
-          draft: false
-          prerelease: false
-          repository: yuzu/yuzu-android
-          token: ${{ secrets.ALT_GITHUB_TOKEN }}
+          name: earelease
+          path: artifacts/
\ No newline at end of file
diff --git a/.github/workflows/android-mainline-play-release.yml b/.github/workflows/android-mainline-play-release.yml
index 74bf3abd9..ce866b901 100644
--- a/.github/workflows/android-mainline-play-release.yml
+++ b/.github/workflows/android-mainline-play-release.yml
@@ -41,6 +41,7 @@ jobs:
         run: |
           echo "GIT_TAG_NAME=android-${{ github.event.inputs.releast-tag }}" >> $GITHUB_ENV
           ./.ci/scripts/android/mainlinebuild.sh
+      - name: Copy and sign artifacts
         env:
           MAINLINE_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
           PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
@@ -48,3 +49,9 @@ jobs:
           SERVICE_ACCOUNT_KEY_B64: ${{ secrets.MAINLINE_SERVICE_ACCOUNT_KEY_B64 }}
           STORE_TRACK: ${{ github.event.inputs.release-track }}
           AUTO_VERSIONED: true
+        run: ./.ci/scripts/android/upload.sh
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: mainline
+          path: artifacts/
\ No newline at end of file
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 13bde68c3..e2ee87ba1 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -14,154 +14,74 @@ jobs:
     name: 'verify format'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: false
       - name: set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
       - name: 'Verify Formatting'
         run: bash -ex ./.ci/scripts/format/script.sh
-  build:
-    name: 'test build'
-    needs: format
+  mainline:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - type: clang
-            image: linux-fresh
-          - type: linux
-            image: linux-fresh
-          - type: windows
-            image: linux-mingw
-    container:
-      image: yuzuemu/build-environments:${{ matrix.image }}
-      options: -u 1001
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Set up cache
-        uses: actions/cache@v3
-        id: ccache-restore
-        with:
-          path: ~/.ccache
-          key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.type }}-
-      - name: Create ccache directory
-        if: steps.ccache-restore.outputs.cache-hit != 'true'
-        run: mkdir -p ~/.ccache
-      - name: Build
-        run: ./.ci/scripts/${{ matrix.type }}/docker.sh
-        env:
-          ENABLE_COMPATIBILITY_REPORTING: "ON"
-      - name: Pack
-        run: ./.ci/scripts/${{ matrix.type }}/upload.sh
-        env:
-          NO_SOURCE_PACK: "YES"
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.type }}
-          path: artifacts/
-  build-mac:
-    name: 'test build (macos)'
     needs: format
-    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          brew install autoconf automake boost ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd
-      - name: Build
-        run: |
-          mkdir build
-          cd build
-          export Qt5_DIR="$(brew --prefix qt@5)/lib/cmake"
-          cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DYUZU_USE_BUNDLED_VCPKG=OFF -DYUZU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF
-          ninja
-  build-msvc:
-    name: 'test build (windows, msvc)'
-    needs: format
-    runs-on: windows-2022
-    steps:
-      - uses: actions/checkout@v3
+      - name: set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          submodules: recursive
-          fetch-depth: 0
+          java-version: '17'
+          distribution: 'temurin'
       - name: Set up cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          path: ~/.buildcache
-          key: ${{ runner.os }}-msvc-${{ github.sha }}
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.ccache
+          key: ${{ runner.os }}-android-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-msvc-
+            ${{ runner.os }}-android-
+      - name: Query tag name
+        uses: olegtarasov/get-tag@v2.1.2
+        id: tagName
       - name: Install dependencies
-        shell: pwsh
-        run: |
-          $ErrorActionPreference = "Stop"
-          $BuildCacheVer = "v0.28.4"
-          $File = "buildcache-windows.zip"
-          $Uri = "https://github.com/mbitsnbites/buildcache/releases/download/$BuildCacheVer/$File"
-          $WebClient = New-Object System.Net.WebClient
-          $WebClient.DownloadFile($Uri, $File)
-          7z x $File
-          $CurrentDir = Convert-Path .
-          echo "$CurrentDir/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - name: Install Vulkan SDK
-        shell: pwsh
-        run: .\.ci\scripts\windows\install-vulkan-sdk.ps1
-      - name: Set up MSVC
-        uses: ilammy/msvc-dev-cmd@v1
-      - name: Configure
-        env:
-          CC: cl.exe
-          CXX: cl.exe
         run: |
-          glslangValidator --version
-          mkdir build
-          cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DYUZU_CRASH_DUMPS=ON
+          sudo apt-get update
+          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
       - name: Build
-        run: cmake --build build
-      - name: Cache Summary
-        run: buildcache -s
-      - name: Pack
-        shell: pwsh
-        run: .\.ci\scripts\windows\upload.ps1
+        run: ./.ci/scripts/android/build.sh
+      - name: Copy and sign artifacts
+        env:
+          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+        run: ./.ci/scripts/android/upload.sh
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: msvc
+          name: mainline
           path: artifacts/
-      - name: Upload EXE
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.INDIVIDUAL_EXE }}
-          path: ${{ env.INDIVIDUAL_EXE }}
-  android:
+  earelease:
     runs-on: ubuntu-latest
     needs: format
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
       - name: set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
       - name: Set up cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -178,15 +98,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
       - name: Build
-        run: ./.ci/scripts/android/build.sh
+        run: ./.ci/scripts/android/eaReleasebuild.sh
       - name: Copy and sign artifacts
         env:
-          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
-          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
-          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
-        run: ./.ci/scripts/android/upload.sh
+          EA_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
+          PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
+          PLAY_ANDROID_KEYSTORE_PASS: ${{ secrets.PLAY_ANDROID_KEYSTORE_PASS }}
+          EA_SERVICE_ACCOUNT_KEY_B64: ${{ secrets.EA_SERVICE_ACCOUNT_KEY_B64 }}
+        run: ./.ci/scripts/android/eaupload.sh
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: android
+          name: earelease
           path: artifacts/

From 48e8223eb951062613345c95e2ff79fc726578f1 Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 00:51:13 +0300
Subject: [PATCH 04/14] ```-x-```

update
---
 .github/workflows/android-ea-play-release.yml       | 4 ++--
 .github/workflows/android-mainline-play-release.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android-ea-play-release.yml b/.github/workflows/android-ea-play-release.yml
index ae9cf5ccd..ecf61fb49 100644
--- a/.github/workflows/android-ea-play-release.yml
+++ b/.github/workflows/android-ea-play-release.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'yuzu-emu/yuzu' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout
         with:
           fetch-depth: 0
@@ -32,7 +32,7 @@ jobs:
       - name: Get tag name
         run: echo "GIT_TAG_NAME=$(cat tag-name.txt)" >> $GITHUB_ENV
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
diff --git a/.github/workflows/android-mainline-play-release.yml b/.github/workflows/android-mainline-play-release.yml
index ce866b901..64824680d 100644
--- a/.github/workflows/android-mainline-play-release.yml
+++ b/.github/workflows/android-mainline-play-release.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'yuzu-emu/yuzu' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout
         with:
           fetch-depth: 0
@@ -29,7 +29,7 @@ jobs:
             process.chdir('${{ github.workspace }}');
             mergebot(execa);
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'

From 35f32c37f1dfdcabdad0eb405982985bdaa07ec2 Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:02:20 +0300
Subject: [PATCH 05/14] Delete .ci/scripts/android/eaReleasebuild.sh

---
 .ci/scripts/android/eaReleasebuild.sh | 33 ---------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 .ci/scripts/android/eaReleasebuild.sh

diff --git a/.ci/scripts/android/eaReleasebuild.sh b/.ci/scripts/android/eaReleasebuild.sh
deleted file mode 100644
index d0cfa8c56..000000000
--- a/.ci/scripts/android/eaReleasebuild.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -ex
-
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-export NDK_CCACHE="$(which ccache)"
-ccache -s
-
-BUILD_FLAVOR="ea"
-
-BUILD_TYPE="release"
-if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
-    BUILD_TYPE="relWithDebInfo"
-fi
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-    export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
-    export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
-    export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
-    base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
-fi
-
-cd src/android
-chmod +x ./gradlew
-./gradlew "assemble${BUILD_FLAVOR}${BUILD_TYPE}" "bundle${BUILD_FLAVOR}${BUILD_TYPE}"
-
-ccache -s
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    rm "${ANDROID_KEYSTORE_FILE}"
-fi

From fcecd16134fb9216e6505fef97ccaa4f9830d209 Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:02:55 +0300
Subject: [PATCH 06/14] ```-x-```

Update
---
 .ci/scripts/android/eabuild.sh | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/.ci/scripts/android/eabuild.sh b/.ci/scripts/android/eabuild.sh
index 1672f2948..d0cfa8c56 100644
--- a/.ci/scripts/android/eabuild.sh
+++ b/.ci/scripts/android/eabuild.sh
@@ -1,18 +1,30 @@
 #!/bin/bash -ex
 
-# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 export NDK_CCACHE="$(which ccache)"
 ccache -s
 
-export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
-export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
-export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
-base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
-./gradlew "publishEaReleaseBundle"
+BUILD_FLAVOR="ea"
+
+BUILD_TYPE="release"
+if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
+    BUILD_TYPE="relWithDebInfo"
+fi
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+    base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+    export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
+    export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
+    export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
+    base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
+fi
+
+cd src/android
+chmod +x ./gradlew
+./gradlew "assemble${BUILD_FLAVOR}${BUILD_TYPE}" "bundle${BUILD_FLAVOR}${BUILD_TYPE}"
 
 ccache -s
 

From 8a12590756c743fe5e548f4c3bfc9c80b6ef8d3d Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:05:27 +0300
Subject: [PATCH 07/14] `Update verify.yml`

---
 .github/workflows/verify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index e2ee87ba1..a0c522728 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -98,7 +98,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
       - name: Build
-        run: ./.ci/scripts/android/eaReleasebuild.sh
+        run: ./.ci/scripts/android/eabuild.sh
       - name: Copy and sign artifacts
         env:
           EA_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}

From 9a9f1ef9e972f4612c893f2f4c15261e69c7aeaa Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:12:48 +0300
Subject: [PATCH 08/14] `Update verify.yml`

---
 .github/workflows/verify.yml | 47 ++----------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index a0c522728..84649da23 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -24,49 +24,6 @@ jobs:
           distribution: 'temurin'
       - name: 'Verify Formatting'
         run: bash -ex ./.ci/scripts/format/script.sh
-  mainline:
-    runs-on: ubuntu-latest
-    needs: format
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Set up cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.ccache
-          key: ${{ runner.os }}-android-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-android-
-      - name: Query tag name
-        uses: olegtarasov/get-tag@v2.1.2
-        id: tagName
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
-      - name: Build
-        run: ./.ci/scripts/android/build.sh
-      - name: Copy and sign artifacts
-        env:
-          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
-          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
-          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
-        run: ./.ci/scripts/android/upload.sh
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: mainline
-          path: artifacts/
   earelease:
     runs-on: ubuntu-latest
     needs: format
@@ -98,14 +55,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
       - name: Build
-        run: ./.ci/scripts/android/eabuild.sh
+        run: ./.ci/scripts/android/build.sh
       - name: Copy and sign artifacts
         env:
           EA_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
           PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
           PLAY_ANDROID_KEYSTORE_PASS: ${{ secrets.PLAY_ANDROID_KEYSTORE_PASS }}
           EA_SERVICE_ACCOUNT_KEY_B64: ${{ secrets.EA_SERVICE_ACCOUNT_KEY_B64 }}
-        run: ./.ci/scripts/android/eaupload.sh
+        run: ./.ci/scripts/android/upload.sh
       - name: Upload
         uses: actions/upload-artifact@v4
         with:

From 7f6400f0e1041bfd47ae15d09ae82871477322e0 Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:13:24 +0300
Subject: [PATCH 09/14] `Update android-ea-play-release.yml`

---
 .github/workflows/android-ea-play-release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android-ea-play-release.yml b/.github/workflows/android-ea-play-release.yml
index ecf61fb49..9635cf070 100644
--- a/.github/workflows/android-ea-play-release.yml
+++ b/.github/workflows/android-ea-play-release.yml
@@ -41,7 +41,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
       - name: Build
-        run: ./.ci/scripts/android/eaReleasebuild.sh
+        run: ./.ci/scripts/android/build.sh
       - name: Copy and sign artifacts
         env:
           EA_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
@@ -51,9 +51,9 @@ jobs:
           STORE_TRACK: ${{ github.event.inputs.release-track }}
           AUTO_VERSIONED: true
           BUILD_EA: true
-        run: ./.ci/scripts/android/eaupload.sh
+        run: ./.ci/scripts/android/upload.sh
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
           name: earelease
-          path: artifacts/
\ No newline at end of file
+          path: artifacts/

From e2f01119f65af12c37aafc9764b5940f359b5386 Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:14:18 +0300
Subject: [PATCH 10/14] `Update build.sh`

---
 .ci/scripts/android/build.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.ci/scripts/android/build.sh b/.ci/scripts/android/build.sh
index 98593017f..d0cfa8c56 100755
--- a/.ci/scripts/android/build.sh
+++ b/.ci/scripts/android/build.sh
@@ -6,7 +6,7 @@
 export NDK_CCACHE="$(which ccache)"
 ccache -s
 
-BUILD_FLAVOR="mainline"
+BUILD_FLAVOR="ea"
 
 BUILD_TYPE="release"
 if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
@@ -15,7 +15,11 @@ fi
 
 if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
     export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+    base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+    export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
+    export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
+    export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
+    base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
 fi
 
 cd src/android

From d70207ab89581b3d8ed24a67c918b24ce68d436f Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:14:44 +0300
Subject: [PATCH 11/14] ```-x-```

---
 .ci/scripts/android/eabuild.sh | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 .ci/scripts/android/eabuild.sh

diff --git a/.ci/scripts/android/eabuild.sh b/.ci/scripts/android/eabuild.sh
deleted file mode 100644
index d0cfa8c56..000000000
--- a/.ci/scripts/android/eabuild.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -ex
-
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-export NDK_CCACHE="$(which ccache)"
-ccache -s
-
-BUILD_FLAVOR="ea"
-
-BUILD_TYPE="release"
-if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
-    BUILD_TYPE="relWithDebInfo"
-fi
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-    export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
-    export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
-    export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
-    base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
-fi
-
-cd src/android
-chmod +x ./gradlew
-./gradlew "assemble${BUILD_FLAVOR}${BUILD_TYPE}" "bundle${BUILD_FLAVOR}${BUILD_TYPE}"
-
-ccache -s
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    rm "${ANDROID_KEYSTORE_FILE}"
-fi

From f5fe8a072346c1792d4f86ad0f72708c6a55f11b Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:15:59 +0300
Subject: [PATCH 12/14] ```-x-```

---
 .ci/scripts/android/eabuild.sh | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .ci/scripts/android/eabuild.sh

diff --git a/.ci/scripts/android/eabuild.sh b/.ci/scripts/android/eabuild.sh
new file mode 100644
index 000000000..d0cfa8c56
--- /dev/null
+++ b/.ci/scripts/android/eabuild.sh
@@ -0,0 +1,33 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+export NDK_CCACHE="$(which ccache)"
+ccache -s
+
+BUILD_FLAVOR="ea"
+
+BUILD_TYPE="release"
+if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
+    BUILD_TYPE="relWithDebInfo"
+fi
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+    base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+    export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
+    export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
+    export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
+    base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
+fi
+
+cd src/android
+chmod +x ./gradlew
+./gradlew "assemble${BUILD_FLAVOR}${BUILD_TYPE}" "bundle${BUILD_FLAVOR}${BUILD_TYPE}"
+
+ccache -s
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    rm "${ANDROID_KEYSTORE_FILE}"
+fi

From e51e6065469a4439eeef8036bda2a0571fa49f99 Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:16:22 +0300
Subject: [PATCH 13/14] `Delete .ci/scripts/android/eaupload.sh`

---
 .ci/scripts/android/eaupload.sh | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 .ci/scripts/android/eaupload.sh

diff --git a/.ci/scripts/android/eaupload.sh b/.ci/scripts/android/eaupload.sh
deleted file mode 100644
index 736bc3b17..000000000
--- a/.ci/scripts/android/eaupload.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -ex
-
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. ./.ci/scripts/common/pre-upload.sh
-
-REV_NAME="yuzu-${GITDATE}-${GITREV}"
-
-BUILD_FLAVOR="ea"
-
-BUILD_TYPE_LOWER="release"
-BUILD_TYPE_UPPER="Release"
-if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
-    BUILD_TYPE_LOWER="relWithDebInfo"
-    BUILD_TYPE_UPPER="RelWithDebInfo"
-fi
-
-cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/${BUILD_TYPE_LOWER}/app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.apk" \
-  "artifacts/${REV_NAME}.apk"
-cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}${BUILD_TYPE_UPPER}"/"app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.aab" \
-  "artifacts/${REV_NAME}.aab"

From 3e4ef8c9e14c09e7f13723ef7e019aa8f75e548f Mon Sep 17 00:00:00 2001
From: cvnertnc <148134890+cvnertnc@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:16:56 +0300
Subject: [PATCH 14/14] `Update upload.sh`

---
 .ci/scripts/android/upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/scripts/android/upload.sh b/.ci/scripts/android/upload.sh
index 26b1a7efa..736bc3b17 100755
--- a/.ci/scripts/android/upload.sh
+++ b/.ci/scripts/android/upload.sh
@@ -7,7 +7,7 @@
 
 REV_NAME="yuzu-${GITDATE}-${GITREV}"
 
-BUILD_FLAVOR="mainline"
+BUILD_FLAVOR="ea"
 
 BUILD_TYPE_LOWER="release"
 BUILD_TYPE_UPPER="Release"