diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rwxr-xr-x | scripts/build_deps.sh | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5cc25a02..2577060e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,6 +55,7 @@ unit_test: image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stage: test script: + - BUILD_TOR=false BUILD_OPENVPN_LIBS=false ./scripts/build_deps.sh - ./gradlew testCustomProductionFatReleaseUnitTest testNormalProductionFatReleaseUnitTest artifacts: paths: diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh index 83fed5e8..14d2bafc 100755 --- a/scripts/build_deps.sh +++ b/scripts/build_deps.sh @@ -15,7 +15,8 @@ DIR_GOLIBS=./bitmaskcore/lib/ DIR_TORLIBS=./tor-android/external/lib EXPECTED_NDK_VERSION="21.4.7075529" EXPECTED_ANDROID_NDK_RELEASE_VERSION="r21e" -BUILD_TOR=true +if [[ -z $BUILD_TOR ]]; then BUILD_TOR=true; fi +if [[ -z $BUILD_OPENVPN_LIBS ]]; then BUILD_OPENVPN_LIBS=true; fi # init # look for empty dir @@ -60,8 +61,9 @@ else fi # build openvpn libs -if [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]] -then +if [[ ${BUILD_OPENVPN_LIBS} == false ]]; then + echo "skipping openvpn" +elif [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]]; then echo "Dirty build: skipped externalNativeBuild - reusing existing libs" else echo "Clean build: starting externalNativeBuild" |