From 93f06cd0e679810480519c788ee08340ada6cfcb Mon Sep 17 00:00:00 2001 From: GraveEaterMadison Date: Fri, 4 Apr 2025 13:29:52 +0530 Subject: [PATCH 01/21] Fixed the episode number problem for animepahe --- .../tachiyomi/animeextension/en/animepahe/AnimePahe.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt index c85d1679..98c11cd3 100644 --- a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt +++ b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt @@ -153,7 +153,15 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() { override fun episodeListParse(response: Response): List { val url = response.request.url.toString() val session = url.substringAfter("&id=").substringBefore("&") - return recursivePages(response, session) + val episodeList = recursivePages(response, session) + + return episodeList + .sortedBy { it.date_upload } // Optional, makes sure it's in correct order + .mapIndexed { index, episode -> + episode.episode_number = (index + 1).toFloat() + episode.name = "Episode ${index + 1}" + episode + } } private fun parseEpisodePage(episodes: List, animeSession: String): MutableList { From b1446b5f73c88e5894cc75f22f7633450dc1458b Mon Sep 17 00:00:00 2001 From: Thinker <170967310+GraveEaterMadison@users.noreply.github.com> Date: Sat, 5 Apr 2025 16:17:20 +0530 Subject: [PATCH 02/21] Changed hianime domain to hianime.bz --- .../src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt index f05e35d3..284946ef 100644 --- a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt +++ b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt @@ -12,7 +12,7 @@ import org.jsoup.nodes.Element class HiAnime : ZoroTheme( "en", "HiAnime", - "https://hianime.to", + "https://hianime.bz", hosterNames = listOf( "HD-1", "HD-2", From 08852e0e61dfdc393f3dd7f65394d324fac8c762 Mon Sep 17 00:00:00 2001 From: Thinker <170967310+GraveEaterMadison@users.noreply.github.com> Date: Sun, 6 Apr 2025 02:08:50 +0530 Subject: [PATCH 03/21] Bump AnimePahe extVersionCode to 30 for improved episode sorting and numbering --- src/en/animepahe/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/en/animepahe/build.gradle b/src/en/animepahe/build.gradle index d2c0f169..2711909a 100644 --- a/src/en/animepahe/build.gradle +++ b/src/en/animepahe/build.gradle @@ -1,11 +1,11 @@ ext { extName = 'AnimePahe' extClass = '.AnimePahe' - extVersionCode = 29 + extVersionCode = 30 } apply from: "$rootDir/common.gradle" dependencies { implementation(libs.jsunpacker) -} \ No newline at end of file +} From bca227aafcb5e54262d984fe8931f84298d037fc Mon Sep 17 00:00:00 2001 From: Thinker <170967310+GraveEaterMadison@users.noreply.github.com> Date: Sun, 6 Apr 2025 10:49:48 +0530 Subject: [PATCH 04/21] Update HiAnime.kt --- .../src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt index 284946ef..f05e35d3 100644 --- a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt +++ b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/HiAnime.kt @@ -12,7 +12,7 @@ import org.jsoup.nodes.Element class HiAnime : ZoroTheme( "en", "HiAnime", - "https://hianime.bz", + "https://hianime.to", hosterNames = listOf( "HD-1", "HD-2", From 935da542c62af40ff4878633b5af12c3dd53908b Mon Sep 17 00:00:00 2001 From: Zero <170967310+GraveEaterMadison@users.noreply.github.com> Date: Fri, 2 May 2025 11:34:31 +0530 Subject: [PATCH 05/21] Changed streaming community domain --- .../animeextension/it/streamingcommunity/StreamingCommunity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt b/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt index 82fadc5a..a41d9088 100644 --- a/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt +++ b/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt @@ -30,7 +30,7 @@ class StreamingCommunity : ConfigurableAnimeSource, AnimeHttpSource() { override val name = "StreamingCommunity" - override val baseUrl = "https://streamingcommunity.photos" + override val baseUrl = "https://streamingcommunity.spa" override val lang = "it" From 3ddb4a015e88db94644993a1861f0a636a5a17b5 Mon Sep 17 00:00:00 2001 From: Zero <170967310+GraveEaterMadison@users.noreply.github.com> Date: Fri, 2 May 2025 11:35:12 +0530 Subject: [PATCH 06/21] Bumped to 6 --- src/it/streamingcommunity/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/it/streamingcommunity/build.gradle b/src/it/streamingcommunity/build.gradle index bff9384f..e990e1ae 100644 --- a/src/it/streamingcommunity/build.gradle +++ b/src/it/streamingcommunity/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'StreamingCommunity' extClass = '.StreamingCommunity' - extVersionCode = 5 + extVersionCode = 6 } apply from: "$rootDir/common.gradle" From f17a446988f197a117bebf9627b1c568228d88af Mon Sep 17 00:00:00 2001 From: Zero <170967310+GraveEaterMadison@users.noreply.github.com> Date: Mon, 12 May 2025 17:43:44 +0530 Subject: [PATCH 07/21] Update StreamingCommunity domain --- .../animeextension/it/streamingcommunity/StreamingCommunity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt b/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt index a41d9088..2ed4cc1f 100644 --- a/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt +++ b/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt @@ -30,7 +30,7 @@ class StreamingCommunity : ConfigurableAnimeSource, AnimeHttpSource() { override val name = "StreamingCommunity" - override val baseUrl = "https://streamingcommunity.spa" + override val baseUrl = "https://streamingcommunity.ovh" override val lang = "it" From 4a1893888c4687fa9a4c3a6ae0abbb74536f0399 Mon Sep 17 00:00:00 2001 From: Zero <170967310+GraveEaterMadison@users.noreply.github.com> Date: Mon, 12 May 2025 17:44:22 +0530 Subject: [PATCH 08/21] bumped build to 7 --- src/it/streamingcommunity/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/it/streamingcommunity/build.gradle b/src/it/streamingcommunity/build.gradle index e990e1ae..c957c25a 100644 --- a/src/it/streamingcommunity/build.gradle +++ b/src/it/streamingcommunity/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'StreamingCommunity' extClass = '.StreamingCommunity' - extVersionCode = 6 + extVersionCode = 7 } apply from: "$rootDir/common.gradle" From 65f8ad2ed0b39a44f7cfc66345daf936c3d2e7b4 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Wed, 4 Jun 2025 04:15:43 -0500 Subject: [PATCH 09/21] E (#1016) Reviewed-on: https://kohiden.xyz/Kohi-den/extensions-source/pulls/1016 --- .github/workflows/batch_close_issues.yml | 4 +- .github/workflows/build_pull_request.yml | 21 ++++--- .github/workflows/build_push.yml | 75 ++++++++++++++---------- .github/workflows/issue_moderator.yml | 4 +- .github/workflows/lock.yml | 4 +- README.md | 10 +++- 6 files changed, 70 insertions(+), 48 deletions(-) diff --git a/.github/workflows/batch_close_issues.yml b/.github/workflows/batch_close_issues.yml index 2e5ac860..dda22407 100644 --- a/.github/workflows/batch_close_issues.yml +++ b/.github/workflows/batch_close_issues.yml @@ -10,9 +10,9 @@ on: jobs: stale: - runs-on: ubuntu-latest + runs-on: docker steps: - - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9 + - uses: https://github.com/actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} # Close everything older than ~6 months diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index c5e88fe3..426ecb5d 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -18,15 +18,15 @@ env: jobs: prepare: name: Prepare job - runs-on: ubuntu-latest + runs-on: docker outputs: individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }} steps: - name: Clone repo - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2 + uses: https://github.com/gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2 - name: Get number of modules run: | @@ -37,7 +37,7 @@ jobs: - id: generate-matrices name: Create output matrices - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 + uses: https://github.com/actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 with: script: | const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES; @@ -52,21 +52,26 @@ jobs: build_individual: name: Build individual modules needs: prepare - runs-on: ubuntu-latest + runs-on: docker strategy: matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }} steps: - name: Checkout PR - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 with: java-version: 17 distribution: temurin + + - name: Set up Android SDK + uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3 + with: + packages: "build-tools;34.0.0" - name: Set up Gradle - uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3 + uses: https://github.com/gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3 with: cache-read-only: true diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index fce227e8..97cef149 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -21,15 +21,22 @@ env: jobs: prepare: name: Prepare job - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }} steps: - name: Clone repo - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: ref: main token: ${{ secrets.BOT_PAT }} + + - name: Get number of modules + run: | + set -x + projects=(src/*/*) + export CI_CHUNK_NUM=${#projects[@]} + echo "NUM_INDIVIDUAL_MODULES=${#projects[@]}" >> $GITHUB_ENV # Temporary pause because of leak of tj-actions/changed-files # - name: Find lib changes @@ -42,7 +49,7 @@ jobs: # safe_output: false - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@v6 # v6.1.0 + uses: https://github.com/crazy-max/ghaction-import-gpg@v6 # v6.1.0 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} @@ -55,20 +62,10 @@ jobs: # run: | # chmod +x ./.github/scripts/bump-versions.py # ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }} - - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@v4 - - - name: Get number of modules - run: | - set -x - projects=(src/*/*) - - echo "NUM_INDIVIDUAL_MODULES=${#projects[@]}" >> $GITHUB_ENV - + - id: generate-matrices name: Create output matrices - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 + uses: https://github.com/actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 with: script: | const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES; @@ -83,27 +80,32 @@ jobs: build_individual: name: Build individual modules needs: prepare - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }} steps: - name: Checkout main branch - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: ref: main - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 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: | echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks - name: Set up Gradle - uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3 + uses: https://github.com/gradle/actions/setup-gradle@245c8a24de79c0dbeabaf19ebcbbd3b2c36f278d # v4 - name: Build extensions (chunk ${{ matrix.chunk }}) env: @@ -114,7 +116,7 @@ jobs: run: chmod +x ./gradlew && ./gradlew -p src assembleRelease - name: Upload APKs (chunk ${{ matrix.chunk }}) - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 + uses: https://code.forgejo.org/forgejo/upload-artifact@16871d9e8cfcf27ff31822cac382bbb5450f1e1e # v4-patch if: "github.repository == 'Kohi-den/extensions-source'" with: name: "individual-apks-${{ matrix.chunk }}" @@ -129,25 +131,34 @@ jobs: needs: - build_individual if: "github.repository == 'Kohi-den/extensions-source'" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: + - name: Setup rsync + run: | + sudo apt-get update && sudo apt install rsync -y + - name: Download APK artifacts - uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4 + uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch with: path: ~/apk-artifacts - + - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 with: java-version: 17 distribution: temurin - + + - name: Set up Android SDK + uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3 + with: + packages: "build-tools;34.0.0" + - name: Checkout main branch - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: ref: main path: main - + - name: Create repo artifacts run: | cd main @@ -155,10 +166,10 @@ jobs: 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 + python ./.github/scripts/create-repo.py - name: Checkout repo branch - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: repository: Kohi-den/extensions token: ${{ secrets.BOT_PAT }} @@ -170,9 +181,9 @@ jobs: rsync -a --delete --exclude .git --exclude .gitignore main/repo/ repo --exclude README.md --exclude repo.json - name: Deploy repo - uses: EndBug/add-and-commit@v9 + uses: https://github.com/EndBug/add-and-commit@v9 with: message: "Update extensions repo" cwd: "./repo" - committer_name: Kohi-den-Bot - committer_email: 177773202+Kohi-den-Bot@users.noreply.github.com + committer_name: Kohi-den-bot + committer_email: kohi-den-bot@noreply.localhost diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index 52695c98..5389be15 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -8,10 +8,10 @@ on: jobs: autoclose: - runs-on: ubuntu-latest + runs-on: docker steps: - name: Moderate issues - uses: aniyomiorg/issue-moderator-action@v2 + uses: https://github.com/aniyomiorg/issue-moderator-action@v2 with: repo-token: ${{ secrets.GITHUB_TOKEN }} duplicate-label: Duplicate diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 9736e440..f1e94756 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -10,11 +10,11 @@ on: jobs: lock: - runs-on: ubuntu-latest + runs-on: docker permissions: issues: write steps: - - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5 + - uses: https://github.com/dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5 with: github-token: ${{ github.token }} issue-inactive-days: '2' diff --git a/README.md b/README.md index 9ca309a5..e5093f38 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,16 @@ +## Donation + +Support this project by helping keep the servers up + +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/T6T3124BZN) + ## Guide just paste this into your anime repo ``` -https://raw.githubusercontent.com/Kohi-den/extensions/main/index.min.json +https://kohiden.xyz/Kohi-den/extensions/raw/branch/main/index.min.json ``` -If your interested in installing just the apks they can be found [Here](https://github.com/Kohi-den/extensions) +If your interested in installing just the apks they can be found [Here](https://kohiden.xyz/Kohi-den/extensions/src/branch/main/apk) ## Support Server From 2d629aaecfdeba38a9a08a8388ab021d9764fc76 Mon Sep 17 00:00:00 2001 From: Kohi-denn Date: Wed, 4 Jun 2025 04:20:05 -0500 Subject: [PATCH 10/21] Update settings.gradle.kts --- settings.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 80cfda1a..243af6c5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,8 +19,8 @@ if (System.getenv("CI") != "true") { } else { // Running in CI (GitHub Actions) - val chunkSize = System.getenv("CI_CHUNK_SIZE").toInt() - val chunk = System.getenv("CI_CHUNK_NUM").toInt() + val chunkSize = System.getenv("CI_CHUNK_SIZE")?.toIntOrNull() ?: Int.MAX_VALUE + val chunk = System.getenv("CI_CHUNK_NUM")?.toIntOrNull() ?: 0 // Loads individual extensions File(rootDir, "src").getChunk(chunk, chunkSize)?.forEach { From 172abad3f82502702c2fcd6c6a2ed4f8349ac986 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Mon, 9 Jun 2025 22:57:33 -0500 Subject: [PATCH 11/21] 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 97cef149..3114a071 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -135,7 +135,7 @@ jobs: steps: - name: Setup rsync run: | - sudo apt-get update && sudo apt install rsync -y + apt-get update && sudo apt install rsync -y - name: Download APK artifacts uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch From 8e0e9ff30fc36c190b71bce9fd5c159ae294c03c Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Mon, 9 Jun 2025 23:08:11 -0500 Subject: [PATCH 12/21] i'm a dumbass --- .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 3114a071..49cfd6aa 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -135,7 +135,7 @@ jobs: steps: - name: Setup rsync run: | - apt-get update && sudo apt install rsync -y + apt-get update && apt install rsync -y - name: Download APK artifacts uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch From 842060363e0bb5cffcdc8b3f117ec607158efaae Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Mon, 9 Jun 2025 23:19:38 -0500 Subject: [PATCH 13/21] setup python setup python cus for some reason it doesn't have it preinstalled --- .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 49cfd6aa..c32f154e 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -152,6 +152,11 @@ jobs: uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3 with: packages: "build-tools;34.0.0" + + - name: Set up Python + uses: https://github.com/actions/setup-python@v4 + with: + python-version: '3.11' - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From cb4c9eecb745b1446c6a1d9e31df34b802b7b2ac Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Mon, 9 Jun 2025 23:30:37 -0500 Subject: [PATCH 14/21] diff python ver --- .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 c32f154e..f722d763 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -156,7 +156,7 @@ jobs: - name: Set up Python uses: https://github.com/actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.13.4' - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From 44fdb1266dfb0d9e4eb2a9ffbc078b7430de573c Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Mon, 9 Jun 2025 23:37:28 -0500 Subject: [PATCH 15/21] 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 f722d763..53514cc7 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -154,9 +154,9 @@ jobs: packages: "build-tools;34.0.0" - name: Set up Python - uses: https://github.com/actions/setup-python@v4 + uses: https://github.com/actions/setup-python@v5 with: - python-version: '3.13.4' + python-version: '3.10' - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From 7b3fbe3d3aea6828aee22ccd6b5b8e08e12645ee Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Mon, 9 Jun 2025 23:43:42 -0500 Subject: [PATCH 16/21] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 53514cc7..7e111ca2 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -157,6 +157,7 @@ jobs: uses: https://github.com/actions/setup-python@v5 with: python-version: '3.10' + architecture: 'x64' - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From d40494aece09331d40a428b7acd5532aa4393bdf Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Mon, 9 Jun 2025 23:49:21 -0500 Subject: [PATCH 17/21] 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 7e111ca2..cab85f29 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -154,7 +154,7 @@ jobs: packages: "build-tools;34.0.0" - name: Set up Python - uses: https://github.com/actions/setup-python@v5 + uses: https://github.com/actions/setup-python@5db1cf9a59fb97c40a68accab29236f0da7e94db # v5 with: python-version: '3.10' architecture: 'x64' From e9a5276856478169b890f1454a0562733462d718 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Tue, 10 Jun 2025 00:09:27 -0500 Subject: [PATCH 18/21] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index cab85f29..915977e2 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -154,11 +154,8 @@ jobs: packages: "build-tools;34.0.0" - name: Set up Python - uses: https://github.com/actions/setup-python@5db1cf9a59fb97c40a68accab29236f0da7e94db # v5 - with: - python-version: '3.10' - architecture: 'x64' - + run: | + apt-get python3 - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: From ff7784f92412816caa96ee91a60b266127874cb8 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Tue, 10 Jun 2025 00:15:21 -0500 Subject: [PATCH 19/21] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 915977e2..77f32182 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -155,7 +155,8 @@ jobs: - name: Set up Python run: | - apt-get python3 + apt-get install -y python3 python3-pip + - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: From c833716c0e64c8582119d2137b0eb3d910d92726 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Tue, 10 Jun 2025 00:26:04 -0500 Subject: [PATCH 20/21] Update .github/workflows/build_push.yml --- .github/workflows/build_push.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 77f32182..3aebee16 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -153,9 +153,10 @@ jobs: with: packages: "build-tools;34.0.0" - - name: Set up Python + - name: Install Python run: | - apt-get install -y python3 python3-pip + apt-get update && apt-get install -y python3 python3-pip + - name: Checkout main branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From a296d06de80d0fd13a6fba401fa113dc5e9f63f4 Mon Sep 17 00:00:00 2001 From: AlmightyHak Date: Tue, 10 Jun 2025 02:02:02 -0500 Subject: [PATCH 21/21] 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 3aebee16..26122162 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -167,11 +167,11 @@ jobs: - name: Create repo artifacts run: | cd main - python ./.github/scripts/move-apks.py + python3 ./.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 + python3 ./.github/scripts/create-repo.py - name: Checkout repo branch uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4