diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml deleted file mode 100644 index 5ffb361e7..000000000 --- a/.github/workflows/build_pull_request.yml +++ /dev/null @@ -1,149 +0,0 @@ -name: PR build check - -on: - pull_request: - paths-ignore: - - '**.md' - - '.github/workflows/issue_moderator.yml' - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number }} - cancel-in-progress: true - -env: - CI_CHUNK_SIZE: 65 - -jobs: - prepare: - name: Prepare job - runs-on: arch - outputs: - isIndividualChanged: ${{ steps.parse-changed-files.outputs.isIndividualChanged }} - isMultisrcChanged: ${{ steps.parse-changed-files.outputs.isMultisrcChanged }} - env: - CI_MODULE_GEN: true - steps: - - name: Clone repo - uses: actions/checkout@v4 - - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: adopt - - - id: get-changed-files - name: Get changed files - uses: Ana06/get-changed-files@v2.2.0 - - - id: parse-changed-files - name: Parse changed files - run: | - isIndividualChanged=0 - isMultisrcChanged=0 - for changedFile in ${{ steps.get-changed-files.outputs.all }}; do - if [[ ${changedFile} == src/* ]]; then - isIndividualChanged=1 - elif [[ ${changedFile} == multisrc/* ]]; then - isMultisrcChanged=1 - elif [[ ${changedFile} == .github/workflows/issue_moderator.yml ]]; then - true - elif [[ ${changedFile} == *.md ]]; then - true - else - isIndividualChanged=1 - isMultisrcChanged=1 - break - fi - done - echo "isIndividualChanged=$isIndividualChanged" >> $GITHUB_OUTPUT - echo "isMultisrcChanged=$isMultisrcChanged" >> $GITHUB_OUTPUT - - - name: Generate multisrc sources - if: ${{ steps.parse-changed-files.outputs.isMultisrcChanged == '1' }} - uses: gradle/gradle-build-action@v2 - with: - arguments: :multisrc:generateExtensions - - - name: Get number of modules - run: | - set -x - ./gradlew -q projects | grep '.*extensions\:\(individual\|multisrc\)\:.*\:.*' > projects.txt - - echo "NUM_INDIVIDUAL_MODULES=$(cat projects.txt | grep '.*\:individual\:.*' | wc -l)" >> $GITHUB_ENV - echo "NUM_MULTISRC_MODULES=$(cat projects.txt | grep '.*\:multisrc\:.*' | wc -l)" >> $GITHUB_ENV - - - id: generate-matrices - name: Create output matrices - uses: actions/github-script@v6 - with: - script: | - const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES; - const numMultisrcModules = process.env.NUM_MULTISRC_MODULES; - const chunkSize = process.env.CI_CHUNK_SIZE; - - const numIndividualChunks = Math.ceil(numIndividualModules / chunkSize); - const numMultisrcChunks = Math.ceil(numMultisrcModules / chunkSize); - - console.log(`Individual modules: ${numIndividualModules} (${numIndividualChunks} chunks of ${chunkSize})`); - console.log(`Multi-source modules: ${numMultisrcModules} (${numMultisrcChunks} chunks of ${chunkSize})`); - - core.setOutput('individualMatrix', { 'chunk': [...Array(numIndividualChunks).keys()] }); - core.setOutput('multisrcMatrix', { 'chunk': [...Array(numMultisrcChunks).keys()] }); - - build_multisrc: - name: Build multisrc modules - needs: prepare - if: ${{ needs.prepare.outputs.isMultisrcChanged == '1' }} - runs-on: arch - steps: - - name: Checkout PR - uses: actions/checkout@v4 - - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: adopt - - - name: Generate sources from the multi-source library - uses: gradle/gradle-build-action@v2 - env: - CI_MODULE_GEN: "true" - with: - arguments: :multisrc:generateExtensions - cache-read-only: true - - - name: Build extensions) - uses: gradle/gradle-build-action@v2 - env: - CI_MULTISRC: "true" - with: - arguments: assembleDebug - cache-read-only: true - - build_individual: - name: Build individual modules - needs: prepare - if: ${{ needs.prepare.outputs.isIndividualChanged == '1' }} - runs-on: arch - steps: - - name: Checkout PR - uses: actions/checkout@v4 - - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: adopt - - - name: Build extensions - uses: gradle/gradle-build-action@v2 - env: - CI_MULTISRC: "false" - with: - arguments: assembleDebug - cache-read-only: true diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index f1d7bcc97..304db474e 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -19,57 +19,17 @@ env: jobs: prepare: name: Prepare job - runs-on: arch - outputs: - individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }} - multisrcMatrix: ${{ steps.generate-matrices.outputs.multisrcMatrix }} + runs-on: ubuntu-latest env: CI_MODULE_GEN: true steps: - name: Clone repo uses: actions/checkout@v4 - - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: adopt - - - name: Generate multisrc sources - uses: gradle/gradle-build-action@v2 - with: - arguments: :multisrc:generateExtensions - - - name: Get number of modules - run: | - set -x - ./gradlew -q projects | grep '.*extensions\:\(individual\|multisrc\)\:.*\:.*' > projects.txt - - echo "NUM_INDIVIDUAL_MODULES=$(cat projects.txt | grep '.*\:individual\:.*' | wc -l)" >> $GITHUB_ENV - echo "NUM_MULTISRC_MODULES=$(cat projects.txt | grep '.*\:multisrc\:.*' | wc -l)" >> $GITHUB_ENV - - - id: generate-matrices - name: Create output matrices - uses: actions/github-script@v6 - with: - script: | - const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES; - const numMultisrcModules = process.env.NUM_MULTISRC_MODULES; - const chunkSize = process.env.CI_CHUNK_SIZE; - - const numIndividualChunks = Math.ceil(numIndividualModules / chunkSize); - const numMultisrcChunks = Math.ceil(numMultisrcModules / chunkSize); - - console.log(`Individual modules: ${numIndividualModules} (${numIndividualChunks} chunks of ${chunkSize})`); - console.log(`Multi-source modules: ${numMultisrcModules} (${numMultisrcChunks} chunks of ${chunkSize})`); - + build_multisrc: name: Build multisrc modules needs: prepare - runs-on: arch + runs-on: ubuntu-latest steps: - name: Checkout master branch uses: actions/checkout@v4 @@ -114,7 +74,7 @@ jobs: build_individual: name: Build individual modules needs: prepare - runs-on: arch + runs-on: ubuntu-latest steps: - name: Checkout master branch uses: actions/checkout@v4 @@ -154,7 +114,7 @@ jobs: needs: - build_multisrc - build_individual - runs-on: arch + runs-on: ubuntu-latest steps: - name: Download APK artifacts uses: actions/download-artifact@v3 @@ -192,3 +152,4 @@ jobs: run: | cd repo ../master/.github/scripts/commit-repo.sh + rm -r ~/apk-artifacts diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt index fc19e98f8..01d38f43c 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt @@ -19,6 +19,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Ainz Scans ID", "https://ainzscans.site", "id"), SingleLang("AiYuManga", "https://aiyumanhua.com", "es", overrideVersionCode = 8), SingleLang("Alceascan", "https://alceascan.my.id", "id"), + SingleLang("Animated Glitched Comics", "https://agscomics.com", "en"), SingleLang("Animated Glitched Scans", "https://anigliscans.xyz", "en", overrideVersionCode = 1), SingleLang("Arkham Scan", "https://arkhamscan.com", "pt-BR"), SingleLang("Arven Scans", "https://arvenscans.com", "en"),