try 3
This commit is contained in:
parent
1b89e7ba29
commit
1a8dcd072c
8
.github/workflows/build_push.yml
vendored
8
.github/workflows/build_push.yml
vendored
@ -69,7 +69,7 @@ jobs:
|
|||||||
configuration-cache-enabled: true
|
configuration-cache-enabled: true
|
||||||
|
|
||||||
- name: Sign APKs
|
- name: Sign APKs
|
||||||
if: github.repository == 'jmir1/tachiyomi-extensions'
|
if: github.repository == 'tachiyomiorg/tachiyomi-extensions'
|
||||||
run: |
|
run: |
|
||||||
cd master
|
cd master
|
||||||
./.github/scripts/sign-apks.sh \
|
./.github/scripts/sign-apks.sh \
|
||||||
@ -79,20 +79,20 @@ jobs:
|
|||||||
${{ secrets.KEY_PASSWORD }}
|
${{ secrets.KEY_PASSWORD }}
|
||||||
|
|
||||||
- name: Create repo artifacts
|
- name: Create repo artifacts
|
||||||
if: github.repository == 'jmir1/tachiyomi-extensions'
|
if: github.repository == 'tachiyomiorg/tachiyomi-extensions'
|
||||||
run: |
|
run: |
|
||||||
cd master
|
cd master
|
||||||
./.github/scripts/create-repo.sh
|
./.github/scripts/create-repo.sh
|
||||||
|
|
||||||
- name: Checkout repo branch
|
- name: Checkout repo branch
|
||||||
if: github.repository == 'jmir1/tachiyomi-extensions'
|
if: github.repository == 'tachiyomiorg/tachiyomi-extensions'
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
ref: repo
|
ref: repo
|
||||||
path: repo
|
path: repo
|
||||||
|
|
||||||
- name: Deploy repo
|
- name: Deploy repo
|
||||||
if: github.repository == 'jmir1/tachiyomi-extensions'
|
if: github.repository == 'tachiyomiorg/tachiyomi-extensions'
|
||||||
run: |
|
run: |
|
||||||
cd repo
|
cd repo
|
||||||
../master/.github/scripts/commit-repo.sh
|
../master/.github/scripts/commit-repo.sh
|
||||||
|
@ -13,8 +13,8 @@ project(":lib-dataimage").projectDir = File("lib/dataimage")
|
|||||||
if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") {
|
if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") {
|
||||||
// Local development or full build for push
|
// Local development or full build for push
|
||||||
|
|
||||||
include(":multisrc")
|
//include(":multisrc")
|
||||||
project(":multisrc").projectDir = File("multisrc")
|
//project(":multisrc").projectDir = File("multisrc")
|
||||||
|
|
||||||
// Loads all extensions
|
// Loads all extensions
|
||||||
File(rootDir, "src").eachDir { dir ->
|
File(rootDir, "src").eachDir { dir ->
|
||||||
@ -25,13 +25,13 @@ if (System.getenv("CI") == null || System.getenv("CI_PUSH") == "true") {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Loads generated extensions from multisrc
|
// Loads generated extensions from multisrc
|
||||||
File(rootDir, "generated-src").eachDir { dir ->
|
//File(rootDir, "generated-src").eachDir { dir ->
|
||||||
dir.eachDir { subdir ->
|
// dir.eachDir { subdir ->
|
||||||
val name = ":extensions:multisrc:${dir.name}:${subdir.name}"
|
// val name = ":extensions:multisrc:${dir.name}:${subdir.name}"
|
||||||
include(name)
|
// include(name)
|
||||||
project(name).projectDir = File("generated-src/${dir.name}/${subdir.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,
|
* 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 isMultisrc = System.getenv("CI_MULTISRC") == "true"
|
||||||
val lang = System.getenv("CI_MATRIX_LANG")
|
val lang = System.getenv("CI_MATRIX_LANG")
|
||||||
|
|
||||||
if (isMultisrc) {
|
/*if (isMultisrc) {
|
||||||
include(":multisrc")
|
include(":multisrc")
|
||||||
project(":multisrc").projectDir = File("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
|
// Loads all extensions
|
||||||
File(rootDir, "src").eachDir { dir ->
|
File(rootDir, "src").eachDir { dir ->
|
||||||
if (dir.name == lang) {
|
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) {
|
inline fun File.eachDir(block: (File) -> Unit) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user