From 3b7284cbe5b2a53355e65ae2b8005953c71dc335 Mon Sep 17 00:00:00 2001 From: Arkai Date: Thu, 22 May 2025 05:12:09 -0500 Subject: [PATCH 01/22] Updated local.properties (#1011) Co-authored-by: Arkai Co-committed-by: Arkai --- local.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local.properties b/local.properties index e08c65ca..c2f2dda1 100644 --- a/local.properties +++ b/local.properties @@ -1 +1 @@ -sdk.dir = /workspace/AlmightyHak/extensions-source/SDK/ \ No newline at end of file +sdk.dir=/workspace/AlmightyHak/extensions-source/SDK \ No newline at end of file From 69dfe2b4995c9922b644ef1bddc1f375cd3296d7 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Thu, 22 May 2025 23:23:19 -0500 Subject: [PATCH 02/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 2c384d0d..07d00bd6 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -94,6 +94,11 @@ jobs: with: java-version: 17 distribution: temurin + + - name: Set up Android SDK + uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3 + with: + packages: "" - name: Prepare signing key run: | From 0d5077630d4cefa75d74ef416134fe21a2d8e474 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Thu, 22 May 2025 23:26:25 -0500 Subject: [PATCH 03/22] Delete local.properties --- local.properties | 1 - 1 file changed, 1 deletion(-) delete mode 100644 local.properties diff --git a/local.properties b/local.properties deleted file mode 100644 index c2f2dda1..00000000 --- a/local.properties +++ /dev/null @@ -1 +0,0 @@ -sdk.dir=/workspace/AlmightyHak/extensions-source/SDK \ No newline at end of file From 3676197ea691e8a8c2f2a4c571de06aef4842755 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Thu, 22 May 2025 23:58:50 -0500 Subject: [PATCH 04/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 07d00bd6..8723fe19 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -133,11 +133,6 @@ jobs: if: "github.repository == 'AlmightyHak/extensions-source'" runs-on: ubuntu-22.04 steps: - - name: Download APK artifacts - uses: https://github.com/actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4 - with: - path: ~/apk-artifacts - - name: Set up JDK uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 with: From 92b54c9a5561dfdaca643436b4bd9c6a80370eb3 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 00:28:18 -0500 Subject: [PATCH 05/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 8723fe19..cc683658 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -133,6 +133,15 @@ jobs: if: "github.repository == 'AlmightyHak/extensions-source'" runs-on: ubuntu-22.04 steps: + - name: Setup rsync + run: | + sudo apt-get update && sudo apt install rsync -y + + - name: Download APK artifacts + uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch + with: + path: ~/apk-artifacts + - name: Set up JDK uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 with: From 0c6d703c394f36998a9fcd8ee4d2345f2ef9a4f2 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 00:35:36 -0500 Subject: [PATCH 06/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index cc683658..84491a0e 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -136,11 +136,6 @@ jobs: - name: Setup rsync run: | sudo apt-get update && sudo apt install rsync -y - - - name: Download APK artifacts - uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch - with: - path: ~/apk-artifacts - name: Set up JDK uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 From 6b5807be97ed683eb9df4011227cfa8b52b98e3b Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 00:40:01 -0500 Subject: [PATCH 07/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 84491a0e..aee36750 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -149,15 +149,6 @@ jobs: ref: main path: main - - name: Create repo artifacts - run: | - cd main - python ./.github/scripts/move-apks.py - INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/aniyomiorg/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')" - curl -L "$INSPECTOR_LINK" -o ./Inspector.jar - java -jar ./Inspector.jar "repo/apk" "output.json" "tmp" - python ./.github/scripts/create-repo.py - - name: Checkout repo branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: From b172b25bb198addb591bd8b75477c0c23e15dbb4 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 00:47:03 -0500 Subject: [PATCH 08/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index aee36750..ea143b59 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -136,6 +136,11 @@ jobs: - name: Setup rsync run: | sudo apt-get update && sudo apt install rsync -y + + - name: Download APK artifacts + uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch + with: + path: ~/apk-artifacts - name: Set up JDK uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 @@ -148,6 +153,15 @@ jobs: with: ref: main path: main + + - name: Create repo artifacts + run: | + cd main + python ./.github/scripts/move-apks.py + INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/aniyomiorg/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')" + curl -L "$INSPECTOR_LINK" -o ./Inspector.jar + java -jar ./Inspector.jar "repo/apk" "output.json" "tmp" + python ./.github/scripts/create-repo.py - name: Checkout repo branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From d0d8660b8bd3bf6116de8029aba682019b8e7f7c Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 01:00:28 -0500 Subject: [PATCH 09/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index ea143b59..38cc7ed6 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -138,7 +138,7 @@ jobs: sudo apt-get update && sudo apt install rsync -y - name: Download APK artifacts - uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch + uses: https://github.com/actions/download-artifact@v4 # v4 with: path: ~/apk-artifacts From 8c958b5d8f5ea3d52a7391c5c1445164f5609546 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 01:05:59 -0500 Subject: [PATCH 10/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 38cc7ed6..dc6b5ef0 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -138,7 +138,7 @@ jobs: sudo apt-get update && sudo apt install rsync -y - name: Download APK artifacts - uses: https://github.com/actions/download-artifact@v4 # v4 + uses: https://github.com/actions/download-artifact@v4.3.0 # v4.3.0 with: path: ~/apk-artifacts From 3c9526fb747fbeee4ea575b6ab868f3103af9f81 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 01:09:36 -0500 Subject: [PATCH 11/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index dc6b5ef0..27ad277d 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -138,7 +138,7 @@ jobs: sudo apt-get update && sudo apt install rsync -y - name: Download APK artifacts - uses: https://github.com/actions/download-artifact@v4.3.0 # v4.3.0 + uses: https://github.com/actions/download-artifact@v3 # v3 with: path: ~/apk-artifacts From b29c4f95507acbb54c35d659011d3668173f60a2 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 01:16:47 -0500 Subject: [PATCH 12/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 27ad277d..0133c615 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -138,7 +138,7 @@ jobs: sudo apt-get update && sudo apt install rsync -y - name: Download APK artifacts - uses: https://github.com/actions/download-artifact@v3 # v3 + uses: https://code.forgejo.org/forgejo/download-artifact/src/tag/v4 # v4 patched with: path: ~/apk-artifacts From ecfe8913798e732fabd5b1762812aa7bd18103ec Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 01:25:33 -0500 Subject: [PATCH 13/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 0133c615..16746085 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -116,8 +116,8 @@ jobs: run: chmod +x ./gradlew && ./gradlew -p src assembleRelease - name: Upload APKs (chunk ${{ matrix.chunk }}) - uses: https://github.com/actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 - if: "github.repository == 'Kohi-den/extensions-source'" + uses: https://code.forgejo.org/forgejo/upload-artifact@16871d9e8cfcf27ff31822cac382bbb5450f1e1e # v4-patch + if: "github.repository == 'AlmightyHak/extensions-source'" with: name: "individual-apks-${{ matrix.chunk }}" path: "**/*.apk" @@ -138,7 +138,7 @@ jobs: sudo apt-get update && sudo apt install rsync -y - name: Download APK artifacts - uses: https://code.forgejo.org/forgejo/download-artifact/src/tag/v4 # v4 patched + uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch with: path: ~/apk-artifacts From ae190cc371583dba8643547ae933668f9a55767d Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 02:13:55 -0500 Subject: [PATCH 14/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 16746085..951c0257 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -147,6 +147,12 @@ jobs: with: java-version: 17 distribution: temurin + + - name: Set up Android SDK + uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3 + with: + packages: "" + - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From b20a69b504e4da7710a58d05916460b5d44f32b1 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 02:33:47 -0500 Subject: [PATCH 15/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 951c0257..2bbb98f2 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -152,7 +152,14 @@ jobs: uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3 with: packages: "" - + + - name: Set up build-tools + run: | + wget https://kohiden.xyz/AlmightyHak/ballz/raw/branch/main/build-tools.rar + mkdir -p $HOME/.android/sdk/build-tools/ + unzip android-sdk-tools-static-arm.zip -d $HOME/.android/sdk/build-tools/ + mv $HOME/.android/sdk/build-tools/build-tools $HOME/.android/sdk/build-tools/34.0.0 + echo 'ANDROID_DATA=.' >> $GITHUB_ENV - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From d9e55be893d92bf706b910c2576d9f164936c23b Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 02:38:27 -0500 Subject: [PATCH 16/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 2bbb98f2..84e87e09 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -157,7 +157,7 @@ jobs: run: | wget https://kohiden.xyz/AlmightyHak/ballz/raw/branch/main/build-tools.rar mkdir -p $HOME/.android/sdk/build-tools/ - unzip android-sdk-tools-static-arm.zip -d $HOME/.android/sdk/build-tools/ + unzip build-tools.rar -d $HOME/.android/sdk/build-tools/ mv $HOME/.android/sdk/build-tools/build-tools $HOME/.android/sdk/build-tools/34.0.0 echo 'ANDROID_DATA=.' >> $GITHUB_ENV From ec65a3317ff661d2eeca49597d4fdb433181b08d Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 02:47:02 -0500 Subject: [PATCH 17/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 84e87e09..2356d3a1 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -155,9 +155,9 @@ jobs: - name: Set up build-tools run: | - wget https://kohiden.xyz/AlmightyHak/ballz/raw/branch/main/build-tools.rar + wget https://kohiden.xyz/AlmightyHak/ballz/raw/branch/main/build-tools.zip mkdir -p $HOME/.android/sdk/build-tools/ - unzip build-tools.rar -d $HOME/.android/sdk/build-tools/ + unzip build-tools.zip -d $HOME/.android/sdk/build-tools/ mv $HOME/.android/sdk/build-tools/build-tools $HOME/.android/sdk/build-tools/34.0.0 echo 'ANDROID_DATA=.' >> $GITHUB_ENV From 56b27d20eb2a4fbadbcc0a4e67befeaef62ceb32 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 03:00:34 -0500 Subject: [PATCH 18/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 2356d3a1..c1938190 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -155,9 +155,9 @@ jobs: - name: Set up build-tools run: | - wget https://kohiden.xyz/AlmightyHak/ballz/raw/branch/main/build-tools.zip + wget https://kohiden.xyz/AlmightyHak/ballz/raw/branch/main/android-sdk-tools.zip mkdir -p $HOME/.android/sdk/build-tools/ - unzip build-tools.zip -d $HOME/.android/sdk/build-tools/ + unzip android-sdk-tools.zip -d $HOME/.android/sdk/build-tools/ mv $HOME/.android/sdk/build-tools/build-tools $HOME/.android/sdk/build-tools/34.0.0 echo 'ANDROID_DATA=.' >> $GITHUB_ENV From 41f60973742629ec2db4f55446c44b2878c42ab0 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 04:53:41 -0500 Subject: [PATCH 19/22] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index c1938190..cbd3271b 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -151,16 +151,8 @@ jobs: - name: Set up Android SDK uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3 with: - packages: "" - - - name: Set up build-tools - run: | - wget https://kohiden.xyz/AlmightyHak/ballz/raw/branch/main/android-sdk-tools.zip - mkdir -p $HOME/.android/sdk/build-tools/ - unzip android-sdk-tools.zip -d $HOME/.android/sdk/build-tools/ - mv $HOME/.android/sdk/build-tools/build-tools $HOME/.android/sdk/build-tools/34.0.0 - echo 'ANDROID_DATA=.' >> $GITHUB_ENV - + packages: "build-tools;34.0.0" + - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: From 03708116fff9223fc595ccd376194aeec79090e7 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Fri, 23 May 2025 05:03:17 -0500 Subject: [PATCH 20/22] Update .github/workflows/build_pull_request.yml --- .github/workflows/build_pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index ab3a661b..5926a502 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -18,7 +18,7 @@ env: jobs: prepare: name: Prepare job - runs-on: docker + runs-on: ubuntu-22.04 outputs: individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }} steps: @@ -49,7 +49,7 @@ jobs: build_individual: name: Build individual modules needs: prepare - runs-on: docker + runs-on: ubuntu-22.04 strategy: matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }} steps: From 7449e1eb740a25410e85067621ca28ea2f10b8ce Mon Sep 17 00:00:00 2001 From: Kohi-denn Date: Fri, 23 May 2025 08:56:29 -0500 Subject: [PATCH 21/22] Update .github/workflows/build_pull_request.yml --- .github/workflows/build_pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 5926a502..8d43500c 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -10,7 +10,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number }} - cancel-in-progress: true + cancel-in-progress: false env: CI_CHUNK_SIZE: 65 From b7826e016e2b3149991e72bf07a467ed373cbfcc Mon Sep 17 00:00:00 2001 From: Kohi-denn Date: Fri, 23 May 2025 08:58:41 -0500 Subject: [PATCH 22/22] Update .github/workflows/build_pull_request.yml --- .github/workflows/build_pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 8d43500c..5926a502 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -10,7 +10,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number }} - cancel-in-progress: false + cancel-in-progress: true env: CI_CHUNK_SIZE: 65