From aea3eb72fa64c99d5319676b3a43353bfea5ea51 Mon Sep 17 00:00:00 2001
From: Ugljesa Jovanovic <ugljesa.jovanovic@ionspin.com>
Date: Mon, 5 Oct 2020 20:01:20 +0000
Subject: [PATCH] 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
---
 .gitlab-ci.yml                                | 28 +++++++++++++++++--
 buildSrc/src/main/kotlin/Utils.kt             |  6 ++--
 .../build.gradle.kts                          |  2 +-
 .../build.gradle.kts                          |  2 +-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1022818..eb32c11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/buildSrc/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt
index 7c73f2e..719f874 100644
--- a/buildSrc/src/main/kotlin/Utils.kt
+++ b/buildSrc/src/main/kotlin/Utils.kt
@@ -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)
     }
 }
diff --git a/multiplatform-crypto-delegated/build.gradle.kts b/multiplatform-crypto-delegated/build.gradle.kts
index af2bd61..e0ea1c3 100644
--- a/multiplatform-crypto-delegated/build.gradle.kts
+++ b/multiplatform-crypto-delegated/build.gradle.kts
@@ -61,7 +61,7 @@ kotlin {
         js {
             browser {
                 testTask {
-                    isRunningInTravis {
+                    isRunningInGitlabCi {
                         enabled = false //Until I sort out testing on travis
                     }
                     useKarma {
diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
index 57c3ca5..db6e92a 100644
--- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts
+++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
@@ -84,7 +84,7 @@ kotlin {
         js {
             browser {
                 testTask {
-                    isRunningInTravis {
+                    isRunningInGitlabCi {
                         enabled = false //Until I sort out testing on travis
                     }
                     useKarma {