From bdd11502cde3b7683da0761474c96c125c420177 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:37:59 +0800 Subject: [PATCH 01/10] renamed to android-app --- .github/workflows/dry-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index c96d76c..25e37df 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -21,7 +21,7 @@ env: JAVA_DISTRO: 'temurin' jobs: - build-app: + android-app: runs-on: macos-latest permissions: contents: write From 0a0445e80c5208254621528175db24666044476a Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:38:24 +0800 Subject: [PATCH 02/10] renamed build step --- .github/workflows/dry-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index 25e37df..bff7517 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -45,7 +45,7 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v6.3.0 - - name: Set up JDK 21 + - name: Set up JDK ${{ env.JAVA_VERSION }} uses: actions/setup-java@v5 with: java-version: ${{ env.JAVA_VERSION }} From d21a54b6c4cc36d7dc99f0516722399ba55c2565 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:41:20 +0800 Subject: [PATCH 03/10] add building for the desktop --- .github/workflows/dry-run.yml | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index bff7517..ccf154e 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -114,3 +114,44 @@ jobs: name: fga-ci-x86-${{ env.COMMIT_COUNT }}-apk path: fga-ci-x86-${{ env.COMMIT_COUNT }}.apk + Desktop-App: + timeout-minutes: 60 + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest, windows-latest ] + runs-on: ${{ matrix.os }} + permissions: + contents: write + discussions: write + env: + COMMIT_COUNT: 0 + steps: + - name: Checkout code + uses: actions/checkout@v7 + with: + fetch-depth: 0 + repository: 'ArthurKun21/FGA-Preview' + token: ${{ secrets.PAT }} + ref: ${{ github.event.inputs.repo_branch || 'development' }} + + - name: Prepare build + run: | + commit_count=$(git rev-list --count HEAD) + echo "COMMIT_COUNT=$commit_count" >> $GITHUB_ENV + + - name: Validate Gradle Wrapper + uses: gradle/actions/wrapper-validation@v6.3.0 + + - name: Set up JDK ${{ env.JAVA_VERSION }} + uses: actions/setup-java@v5 + with: + java-version: ${{ env.JAVA_VERSION }} + distribution: ${{ env.JAVA_DISTRO }} + + - name: Set up gradle + uses: gradle/actions/setup-gradle@v6.3.0 + + - name: Build Desktop Release for ${{ matrix.os }} + run: | + ./gradlew :DesktopApp:packageReleaseDistributionForCurrentOS From 9706a370f7a8cee70c7b1f8b655aa3244d3b4ac2 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:50:50 +0800 Subject: [PATCH 04/10] upload desktop build --- .github/workflows/dry-run.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index ccf154e..d75fb36 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -7,7 +7,7 @@ on: # Manual triggers workflow_dispatch: inputs: - upload_apk: + upload_build: description: 'Upload APK to GitHub Actions' required: false default: 'false' @@ -73,42 +73,42 @@ jobs: cp app/build/outputs/mapping/ci/mapping.txt fga-ci-${{ env.COMMIT_COUNT }}-mapping.txt - name: Upload Mapping - if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_apk == 'true' || github.event.inputs.upload_apk == true) }} + if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} uses: actions/upload-artifact@v7 with: name: fga-ci-${{ env.COMMIT_COUNT }}-mapping path: fga-ci-${{ env.COMMIT_COUNT }}-mapping.txt - name: Upload APK - if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_apk == 'true' || github.event.inputs.upload_apk == true) }} + if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} uses: actions/upload-artifact@v7 with: name: fga-ci-${{ env.COMMIT_COUNT }}-apk path: fga-ci-${{ env.COMMIT_COUNT }}.apk - name: Upload APK (arm64-v8a) - if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_apk == 'true' || github.event.inputs.upload_apk == true) }} + if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} uses: actions/upload-artifact@v7 with: name: fga-ci-arm64-v8a-${{ env.COMMIT_COUNT }}-apk path: fga-ci-arm64-v8a-${{ env.COMMIT_COUNT }}.apk - name: Upload APK (armeabi-v7a) - if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_apk == 'true' || github.event.inputs.upload_apk == true) }} + if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} uses: actions/upload-artifact@v7 with: name: fga-ci-armeabi-v7a-${{ env.COMMIT_COUNT }}-apk path: fga-ci-armeabi-v7a-${{ env.COMMIT_COUNT }}.apk - name: Upload APK (x86_64) - if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_apk == 'true' || github.event.inputs.upload_apk == true) }} + if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} uses: actions/upload-artifact@v7 with: name: fga-ci-x86_64-${{ env.COMMIT_COUNT }}-apk path: fga-ci-x86_64-${{ env.COMMIT_COUNT }}.apk - name: Upload APK (x86) - if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_apk == 'true' || github.event.inputs.upload_apk == true) }} + if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} uses: actions/upload-artifact@v7 with: name: fga-ci-x86-${{ env.COMMIT_COUNT }}-apk @@ -155,3 +155,10 @@ jobs: - name: Build Desktop Release for ${{ matrix.os }} run: | ./gradlew :DesktopApp:packageReleaseDistributionForCurrentOS + + - name: Upload ${{ matrix.os }} Build + if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} + uses: actions/upload-artifact@v7 + with: + name: fga-desktop-alpha-${{ env.COMMIT_COUNT }} + path: ./desktopApp/build/compose/binaries/main-release/ From 12581d20f0ff60f1c6653286233d86dc40e36255 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:51:35 +0800 Subject: [PATCH 05/10] update setup-java --- .github/workflows/dry-run.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index d75fb36..ec7dd5b 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -46,7 +46,7 @@ jobs: uses: gradle/actions/wrapper-validation@v6.3.0 - name: Set up JDK ${{ env.JAVA_VERSION }} - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} @@ -144,7 +144,7 @@ jobs: uses: gradle/actions/wrapper-validation@v6.3.0 - name: Set up JDK ${{ env.JAVA_VERSION }} - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} From 20b8e4afc4c3cca7f0666de5a5b4747ff6326618 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:54:01 +0800 Subject: [PATCH 06/10] update description --- .github/workflows/dry-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index ec7dd5b..fe01f69 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: inputs: upload_build: - description: 'Upload APK to GitHub Actions' + description: 'Upload Build to GitHub Actions' required: false default: 'false' repo_branch: From 8860c2c1802a765897653dcf63798de341fe7e70 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:59:30 +0800 Subject: [PATCH 07/10] update env handling for windows --- .github/workflows/dry-run.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index fe01f69..64036ee 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -135,10 +135,17 @@ jobs: token: ${{ secrets.PAT }} ref: ${{ github.event.inputs.repo_branch || 'development' }} - - name: Prepare build + - name: Prepare build (macos/ubuntu) + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' run: | commit_count=$(git rev-list --count HEAD) echo "COMMIT_COUNT=$commit_count" >> $GITHUB_ENV + + - name: Prepare build (windows) + if: matrix.os == 'windows-latest' + run: | + $commit_count = git rev-list --count HEAD + "COMMIT_COUNT=$commit_count" | Out-File -FilePath $env:GITHUB_ENV -Append - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v6.3.0 From 7befbfe483cae40fcf24e8bbec4fa44717a8db60 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 13:07:53 +0800 Subject: [PATCH 08/10] fix the upload name for desktop --- .github/workflows/dry-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index 64036ee..1912aa6 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -167,5 +167,5 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} uses: actions/upload-artifact@v7 with: - name: fga-desktop-alpha-${{ env.COMMIT_COUNT }} + name: fga-desktop-alpha-${{ env.COMMIT_COUNT }}-${{ matrix.os }} path: ./desktopApp/build/compose/binaries/main-release/ From 4fcb5bdb59021d7d5d8e2fe05a3468b726547847 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 13:09:46 +0800 Subject: [PATCH 09/10] updated the upload name for desktop --- .github/workflows/dry-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index 1912aa6..14ad5de 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -167,5 +167,5 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_build == 'true' || github.event.inputs.upload_build == true) }} uses: actions/upload-artifact@v7 with: - name: fga-desktop-alpha-${{ env.COMMIT_COUNT }}-${{ matrix.os }} + name: fga-ci-${{ matrix.os }}-desktop-${{ env.COMMIT_COUNT }} path: ./desktopApp/build/compose/binaries/main-release/ From 6f21bea9d18cb5253ffc9eac882b548a78bc0b57 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Tue, 1 Sep 2026 13:31:14 +0800 Subject: [PATCH 10/10] update to java 25 temurin --- .github/workflows/dry-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml index 14ad5de..005c2d8 100644 --- a/.github/workflows/dry-run.yml +++ b/.github/workflows/dry-run.yml @@ -17,7 +17,7 @@ on: default: 'development' env: - JAVA_VERSION: 21 + JAVA_VERSION: 25 JAVA_DISTRO: 'temurin' jobs: