diff --git a/.github/workflows/batch_close_issues.yml b/.github/workflows/batch_close_issues.yml index dda22407..2e5ac860 100644 --- a/.github/workflows/batch_close_issues.yml +++ b/.github/workflows/batch_close_issues.yml @@ -10,9 +10,9 @@ on: jobs: stale: - runs-on: docker + runs-on: ubuntu-latest steps: - - uses: https://github.com/actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9 + - uses: 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 426ecb5d..c5e88fe3 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: docker + runs-on: ubuntu-latest outputs: individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }} steps: - name: Clone repo - uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Validate Gradle Wrapper - uses: https://github.com/gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2 + uses: 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: https://github.com/actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 with: script: | const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES; @@ -52,26 +52,21 @@ jobs: build_individual: name: Build individual modules needs: prepare - runs-on: docker + runs-on: ubuntu-latest strategy: matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }} steps: - name: Checkout PR - uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up JDK - uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: 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: https://github.com/gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3 + uses: 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 97cef149..fce227e8 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -21,22 +21,15 @@ env: jobs: prepare: name: Prepare job - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest outputs: individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }} steps: - name: Clone repo - uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: 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 @@ -49,7 +42,7 @@ jobs: # safe_output: false - name: Import GPG key - uses: https://github.com/crazy-max/ghaction-import-gpg@v6 # v6.1.0 + uses: crazy-max/ghaction-import-gpg@v6 # v6.1.0 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} @@ -62,10 +55,20 @@ 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: https://github.com/actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 with: script: | const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES; @@ -80,32 +83,27 @@ jobs: build_individual: name: Build individual modules needs: prepare - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }} steps: - name: Checkout main branch - uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: ref: main - name: Set up JDK - uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: 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: https://github.com/gradle/actions/setup-gradle@245c8a24de79c0dbeabaf19ebcbbd3b2c36f278d # v4 + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3 - name: Build extensions (chunk ${{ matrix.chunk }}) env: @@ -116,7 +114,7 @@ jobs: run: chmod +x ./gradlew && ./gradlew -p src assembleRelease - name: Upload APKs (chunk ${{ matrix.chunk }}) - uses: https://code.forgejo.org/forgejo/upload-artifact@16871d9e8cfcf27ff31822cac382bbb5450f1e1e # v4-patch + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 if: "github.repository == 'Kohi-den/extensions-source'" with: name: "individual-apks-${{ matrix.chunk }}" @@ -131,34 +129,25 @@ jobs: needs: - build_individual if: "github.repository == 'Kohi-den/extensions-source'" - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest 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 + uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4 with: path: ~/apk-artifacts - + - name: Set up JDK - uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: 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: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: ref: main path: main - + - name: Create repo artifacts run: | cd main @@ -166,10 +155,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: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: repository: Kohi-den/extensions token: ${{ secrets.BOT_PAT }} @@ -181,9 +170,9 @@ jobs: rsync -a --delete --exclude .git --exclude .gitignore main/repo/ repo --exclude README.md --exclude repo.json - name: Deploy repo - uses: https://github.com/EndBug/add-and-commit@v9 + uses: EndBug/add-and-commit@v9 with: message: "Update extensions repo" cwd: "./repo" - committer_name: Kohi-den-bot - committer_email: kohi-den-bot@noreply.localhost + committer_name: Kohi-den-Bot + committer_email: 177773202+Kohi-den-Bot@users.noreply.github.com diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index 5389be15..52695c98 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -8,10 +8,10 @@ on: jobs: autoclose: - runs-on: docker + runs-on: ubuntu-latest steps: - name: Moderate issues - uses: https://github.com/aniyomiorg/issue-moderator-action@v2 + uses: 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 f1e94756..9736e440 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -10,11 +10,11 @@ on: jobs: lock: - runs-on: docker + runs-on: ubuntu-latest permissions: issues: write steps: - - uses: https://github.com/dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5 + - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5 with: github-token: ${{ github.token }} issue-inactive-days: '2' diff --git a/README.md b/README.md index e5093f38..9ca309a5 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,10 @@ -## 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://kohiden.xyz/Kohi-den/extensions/raw/branch/main/index.min.json +https://raw.githubusercontent.com/Kohi-den/extensions/main/index.min.json ``` -If your interested in installing just the apks they can be found [Here](https://kohiden.xyz/Kohi-den/extensions/src/branch/main/apk) +If your interested in installing just the apks they can be found [Here](https://github.com/Kohi-den/extensions) ## Support Server diff --git a/settings.gradle.kts b/settings.gradle.kts index 243af6c5..80cfda1a 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")?.toIntOrNull() ?: Int.MAX_VALUE - val chunk = System.getenv("CI_CHUNK_NUM")?.toIntOrNull() ?: 0 + val chunkSize = System.getenv("CI_CHUNK_SIZE").toInt() + val chunk = System.getenv("CI_CHUNK_NUM").toInt() // Loads individual extensions File(rootDir, "src").getChunk(chunk, chunkSize)?.forEach { diff --git a/src/en/zoro/build.gradle b/src/en/zoro/build.gradle index ffcebb65..6d3ec87d 100644 --- a/src/en/zoro/build.gradle +++ b/src/en/zoro/build.gradle @@ -3,7 +3,7 @@ ext { extClass = '.HiAnime' themePkg = 'zorotheme' baseUrl = 'https://hianimez.to' - overrideVersionCode = 51 + overrideVersionCode = 52 } apply from: "$rootDir/common.gradle" 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 307fa43f..6806e21a 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 @@ -19,6 +19,7 @@ class HiAnime : ZoroTheme( hosterNames = listOf( "HD-1", "HD-2", + "HD-3", "StreamTape", ), ) { @@ -53,7 +54,7 @@ class HiAnime : ZoroTheme( )?.let(::listOf) ?: emptyList() } - "HD-1", "HD-2" -> megaCloudExtractor.getVideosFromUrl( + "HD-1", "HD-2", "HD-3" -> megaCloudExtractor.getVideosFromUrl( server.link, server.type, server.name,