Run on external pull request (#18)

* Run on external pull request

* Working linux build, disable pull requests for now

* Try manual flag

* Try manual flag 2

* Try manual flag 3

* Travis -> Gitlab
This commit is contained in:
Ugljesa Jovanovic 2020-10-05 20:01:20 +00:00 committed by GitHub
parent 1a470eb272
commit aea3eb72fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 7 deletions

View File

@ -1,19 +1,43 @@
stages:
- prepare
- build
- deploy
workflow:
rules:
- if: $CI_MERGE_REQUEST_IID
- if: $CI_EXTERNAL_PULL_REQUEST_IID
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables:
GIT_SUBMODULE_STRATEGY: recursive
simpleCheck:
stage: prepare
script: ./gradlew tasks
tags:
- linuxX64
buildLinux:
stage: build
when: manual
allow_failure: false
script:
- echo TEST_PULL_REQUEST_LINUX
- env
- ./linuxBuild.sh
tags:
- linuxX64
buildMac:
stage: build
when: manual
allow_failure: false
script: echo TEST_PULL_REQUEST_MAC
tags:
- macos
buildWindows:
stage: build
when: manual
allow_failure: false
script: echo TEST_PULL_REQUEST_WIN
tags:
- windowsX64

View File

@ -13,7 +13,7 @@ import java.io.File
*/
fun isInIdea() = System.getProperty("idea.active") == "true"
fun isInTravis() = System.getenv("TRAVIS") == "true"
fun isInGitlabCi() = System.getenv("GITLAB_CI") == "true"
fun getProjectPath() : String {
val path = System.getProperty("PROJECT_PATH")
@ -49,8 +49,8 @@ fun KotlinMultiplatformExtension.isNotRunningInIdea(block: KotlinMultiplatformEx
}
}
fun KotlinMultiplatformExtension.isRunningInTravis(block: KotlinMultiplatformExtension.() -> Unit) {
if (isInTravis()) {
fun KotlinMultiplatformExtension.isRunningInGitlabCi(block: KotlinMultiplatformExtension.() -> Unit) {
if (isInGitlabCi()) {
block(this)
}
}

View File

@ -61,7 +61,7 @@ kotlin {
js {
browser {
testTask {
isRunningInTravis {
isRunningInGitlabCi {
enabled = false //Until I sort out testing on travis
}
useKarma {

View File

@ -84,7 +84,7 @@ kotlin {
js {
browser {
testTask {
isRunningInTravis {
isRunningInGitlabCi {
enabled = false //Until I sort out testing on travis
}
useKarma {