From a53dc4ef852e7fff3045db4da2893a9b30ce392a Mon Sep 17 00:00:00 2001 From: kevlahnota Date: Sat, 16 Nov 2024 06:49:36 +0800 Subject: [PATCH 1/3] Update snapshots-android.yml add missing version.txt --- .github/workflows/snapshots-android.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snapshots-android.yml b/.github/workflows/snapshots-android.yml index d1fdb04adb9..bfc32f45f87 100644 --- a/.github/workflows/snapshots-android.yml +++ b/.github/workflows/snapshots-android.yml @@ -93,6 +93,7 @@ jobs: mkdir upload mv /home/runner/work/forge/forge/forge-gui-android/target/*-signed-aligned.apk upload/ mv /home/runner/work/forge/forge/forge-gui-android/target/assets.zip upload/ + mv /home/runner/work/forge/forge/forge-gui-android/target/classes/assets/version.txt upload/ cd upload ls env: From cf84ae5719e6ee1755002d0a9fdd3e5222d915e2 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sat, 16 Nov 2024 08:33:45 +0800 Subject: [PATCH 2/3] fix NoSuchElementException --- .../main/java/forge/gamemodes/match/input/InputQueue.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputQueue.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputQueue.java index b669697d598..7319d31e2d2 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputQueue.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputQueue.java @@ -56,8 +56,9 @@ public class InputQueue extends Observable { if (topMostInput != inp) { System.out.println("Cannot remove input " + inp.getClass().getSimpleName() + " because it's not on top of stack. Stack = " + inputStack ); - } else { - inputStack.pop(); + } else if (topMostInput != null) { + // if topMostInput is null then it means the inputstack is already empty, why this is called twice? + inputStack.pop(); } updateObservers(); } From c11ca5d3fbdca457c25d66a98f9736f9d6475053 Mon Sep 17 00:00:00 2001 From: kevlahnota Date: Sat, 16 Nov 2024 09:39:28 +0800 Subject: [PATCH 3/3] Remove input check upload on android snapshot workflow Don't know why this input is needed but it seems it's not taken into account even with default value to true when the cron job triggers, we have already test build workflow for android apk along with debug signing for checking if build and signing succeeded. Check discord reports on missing/cannot update reports. --- .github/workflows/snapshots-android.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/snapshots-android.yml b/.github/workflows/snapshots-android.yml index bfc32f45f87..793f4cddd7f 100644 --- a/.github/workflows/snapshots-android.yml +++ b/.github/workflows/snapshots-android.yml @@ -8,11 +8,11 @@ on: description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' required: false default: false - upload_package: - type: boolean - description: 'Upload the completed Android package' - required: false - default: true + #upload_package: + # type: boolean + # description: 'Upload the completed Android package' + # required: false + # default: true schedule: # * is a special character in YAML so you have to quote this string - cron: '00 19 * * *' @@ -101,7 +101,7 @@ jobs: - name: 📂 Sync files uses: SamKirkland/FTP-Deploy-Action@v4.3.4 - if: ${{ inputs.upload_package }} + #if: ${{ inputs.upload_package }} with: server: ftp.cardforge.org username: ${{ secrets.FTP_USERNAME }}