From 49c3d78764d2fdbc0e58bce62a2ea8439e89d7e7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 5 Feb 2018 14:07:39 +0100
Subject: 8832 custom build script that builds first :ics-openvpn:main and
 afterwards :app

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3b7de0a..ff5f559c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,9 +97,8 @@ build:
   image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest"
   stage: build
   script:
-    - git submodule sync --recursive
-    - git submodule update --init --recursive
-    - ./gradlew clean assembleDebug
+    - ./cleanProject.sh
+    - ./build.sh
   artifacts:
     paths:
     - app/build/outputs/
@@ -108,9 +107,10 @@ build_release:
   image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest"
   stage: build
   script:
-    - git submodule sync --recursive
-    - git submodule update --init --recursive
-    - ./gradlew clean
+    - ./cleanProject.sh
+    - cd ./ics-openvpn
+    - ./gradlew clean main:externalNativeBuildCleanNoovpn3Release main:externalNativeBuildNoovpn3Release
+    - cd ..
     - ./gradlew assembleProductionRelease
     - ./gradlew assembleProductionBeta
   artifacts:
-- 
cgit v1.2.3