CI: Enable android artifacts

.ci/scripts/android/build.sh

@@ -1,6 +1,7 @@
 #!/bin/bash -ex
 
 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+# SPDX-FileCopyrightText: 2024 suyu Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 export NDK_CCACHE="$(which ccache)"
@@ -9,7 +10,7 @@ ccache -s
 BUILD_FLAVOR="mainline"
 
 BUILD_TYPE="release"
-if [ "${GITHUB_REPOSITORY}" == "suyu-emu/suyu" ]; then
+if [ "${GITHUB_REPOSITORY}" == "suyu/suyu" ]; then
     BUILD_TYPE="relWithDebInfo"
 fi
 

.ci/scripts/android/upload.sh

@@ -11,7 +11,7 @@ BUILD_FLAVOR="mainline"
 
 BUILD_TYPE_LOWER="release"
 BUILD_TYPE_UPPER="Release"
-if [ "${GITHUB_REPOSITORY}" == "suyu-emu/suyu" ]; then
+if [ "${GITHUB_REPOSITORY}" == "suyu/suyu" ]; then
     BUILD_TYPE_LOWER="relWithDebInfo"
     BUILD_TYPE_UPPER="RelWithDebInfo"
 fi

.forgejo/workflows/verify.yml

@@ -16,8 +16,8 @@ on:
       - 'externals/**'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
-    paths-ignore:
-      - 'src/android/**'
+    # paths-ignore:
+    #   - 'src/android/**'
   push:
     branches: [ "dev" ]
     paths:
@@ -28,8 +28,9 @@ on:
       - 'CMakeLists.txt'
       - 'vcpkg.json'
       - '.forgejo/workflows/verify.yml'
-    paths-ignore:
-      - 'src/android/**'
+      - '.ci/**'
+    # paths-ignore:
+    #   - 'src/android/**'
 
 env:
   PR_NUMBER: pr${{ github.event.number }}
@@ -173,47 +174,44 @@ jobs:
   #       with:
   #         name: ${{ env.INDIVIDUAL_EXE }}
   #         path: ${{ env.INDIVIDUAL_EXE }}
-  # android:
-  #   runs-on: ubuntu-latest
-  #   needs: format
-  #   steps:
-  #     - uses: https://code.forgejo.org/actions/checkout@v3
-  #       with:
-  #         submodules: recursive
-  #         fetch-depth: 0
-  #     - name: set up JDK 17
-  #       uses: https://github.com/actions/setup-java@v3
-  #       with:
-  #         java-version: '17'
-  #         distribution: 'temurin'
-  #     - name: Set up cache
-  #       uses: https://code.forgejo.org/actions/cache@v3
-  #       with:
-  #         path: |
-  #           ~/.gradle/caches
-  #           ~/.gradle/wrapper
-  #           .ccache
-  #         key: ${{ runner.os }}-android-${{ github.sha }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-android-
-  #     - name: Query tag name
-  #       uses: https://github.com/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: https://code.forgejo.org/actions/upload-artifact@v3
-  #       with:
-  #         name: android
-  #         path: artifacts/
+  android:
+    runs-on: ubuntu-latest
+    container: fijxu/build-environments:android
+    needs: format
+    steps:
+      - uses: https://code.forgejo.org/actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: set up JDK 17
+        uses: https://github.com/actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Set up cache
+        uses: https://code.forgejo.org/actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.ccache
+          key: ${{ runner.os }}-android-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-android-
+      - name: Query tag name
+        uses: https://github.com/olegtarasov/get-tag@v2.1.2
+        id: tagName
+      - 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: https://code.forgejo.org/actions/upload-artifact@v3
+        with:
+          name: android
+          path: artifacts/