diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index f86c1777f..119e8b175 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.5.0 + uses: styfle/cancel-workflow-action@0.8.0 with: access_token: ${{ github.token }} diff --git a/.github/workflows/cancel_pull_request.yml b/.github/workflows/cancel_pull_request.yml new file mode 100644 index 000000000..4d6b65f1e --- /dev/null +++ b/.github/workflows/cancel_pull_request.yml @@ -0,0 +1,15 @@ +name: Cancel old pull request workflows + +on: + workflow_run: + workflows: ["PR build check"] + types: + - requested + +jobs: + cancel: + runs-on: ubuntu-latest + steps: + - uses: styfle/cancel-workflow-action@0.8.0 + with: + workflow_id: ${{ github.event.workflow.id }} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt index dcda37b4b..6cb151e12 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt @@ -7,7 +7,7 @@ import java.util.Locale /** * This is meant to be used in place of a factory extension, specifically for what would be a multi-source extension. - * A multi-lang (but not multi-source) extension should still be made as a factory extensiion. + * A multi-lang (but not multi-source) extension should still be made as a factory extension. * Use a generator for initial setup of a theme source or when all of the inheritors need a version bump. * Source list (val sources) should be kept up to date. */ diff --git a/settings.gradle.kts b/settings.gradle.kts index fd734ef3e..7974a8e04 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,7 @@ include(":lib-dataimage") project(":lib-dataimage").projectDir = File("lib/dataimage") if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") { - // Local development + // Local development or full build for push include(":multisrc") project(":multisrc").projectDir = File("multisrc")