From 1a8dcd072c80dafa7e0de6299b3a6fdba3297e6b Mon Sep 17 00:00:00 2001 From: jmir1 Date: Thu, 22 Apr 2021 22:45:41 +0200 Subject: [PATCH] try 3 --- .github/workflows/build_push.yml | 8 ++++---- settings.gradle.kts | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 9d2e8cc0c..982b41723 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -69,7 +69,7 @@ jobs: configuration-cache-enabled: true - name: Sign APKs - if: github.repository == 'jmir1/tachiyomi-extensions' + if: github.repository == 'tachiyomiorg/tachiyomi-extensions' run: | cd master ./.github/scripts/sign-apks.sh \ @@ -79,20 +79,20 @@ jobs: ${{ secrets.KEY_PASSWORD }} - name: Create repo artifacts - if: github.repository == 'jmir1/tachiyomi-extensions' + if: github.repository == 'tachiyomiorg/tachiyomi-extensions' run: | cd master ./.github/scripts/create-repo.sh - name: Checkout repo branch - if: github.repository == 'jmir1/tachiyomi-extensions' + if: github.repository == 'tachiyomiorg/tachiyomi-extensions' uses: actions/checkout@v2 with: ref: repo path: repo - name: Deploy repo - if: github.repository == 'jmir1/tachiyomi-extensions' + if: github.repository == 'tachiyomiorg/tachiyomi-extensions' run: | cd repo ../master/.github/scripts/commit-repo.sh diff --git a/settings.gradle.kts b/settings.gradle.kts index 0cc75d9c7..e4ddca885 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,8 +13,8 @@ project(":lib-dataimage").projectDir = File("lib/dataimage") if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") { // Local development or full build for push - include(":multisrc") - project(":multisrc").projectDir = File("multisrc") + //include(":multisrc") + //project(":multisrc").projectDir = File("multisrc") // Loads all extensions File(rootDir, "src").eachDir { dir -> @@ -25,13 +25,13 @@ if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") { } } // Loads generated extensions from multisrc - File(rootDir, "generated-src").eachDir { dir -> - dir.eachDir { subdir -> - val name = ":extensions:multisrc:${dir.name}:${subdir.name}" - include(name) - project(name).projectDir = File("generated-src/${dir.name}/${subdir.name}") - } - } + //File(rootDir, "generated-src").eachDir { dir -> + // dir.eachDir { subdir -> + // val name = ":extensions:multisrc:${dir.name}:${subdir.name}" + // include(name) + // project(name).projectDir = File("generated-src/${dir.name}/${subdir.name}") + // } + //} /** * If you're developing locally and only want to work with a single module, @@ -47,7 +47,7 @@ if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") { val isMultisrc = System.getenv("CI_MULTISRC") == "true" val lang = System.getenv("CI_MATRIX_LANG") - if (isMultisrc) { + /*if (isMultisrc) { include(":multisrc") project(":multisrc").projectDir = File("multisrc") @@ -61,7 +61,7 @@ if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") { } } } - } else { + } else {*/ // Loads all extensions File(rootDir, "src").eachDir { dir -> if (dir.name == lang) { @@ -72,7 +72,7 @@ if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") { } } } - } + //} } inline fun File.eachDir(block: (File) -> Unit) {