diff options
| author | fupduck <fupduck@riseup.net> | 2018-02-06 05:53:09 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-02-06 05:53:09 -0800 |
| commit | edd34192484f4eb618fdcc2a68b18168c155d63c (patch) | |
| tree | d884f63e74911d2ea2cf7bc864414a623e15a2b3 /.gitlab-ci.yml | |
| parent | c0848bac7ac44f4b09f9e5d66ab71f079cb0f514 (diff) | |
| parent | d2d61a16fd2a3ea0fd42073de98d1311b184444d (diff) | |
Merge branch '#8832_update_ics-openvpn' into '0.9.8'
#8832 update ics openvpn
See merge request leap/bitmask_android!33
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 55 |
1 files changed, 45 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0edd09a9..91ee6c3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,8 +28,7 @@ variables: - if ! .gitlab/build.sh ${DOCKER_IMAGE} >> dockerbuild.log 2>&1; then echo "Image build failed. Please check dockerbuild.log."; exit 1; fi; allow_failure: false artifacts: - when: on_failure - expire_in: 31d + expire_in: 3d paths: - dockerbuild.log @@ -57,13 +56,50 @@ unit_test: script: - ./gradlew test +#ui_test: +# image: "0xacab.org:4567/leap/bitmask_android/android-emulator:latest" +# stage: test +# script: +# - emulator -avd testApi27 -no-audio -no-window & +# - .gitlab/wait-for-emulator.sh +# - adb devices +# - adb shell settings put global window_animation_scale 0 & +# - adb shell settings put global transition_animation_scale 0 & +# - adb shell settings put global animator_duration_scale 0 & +# - adb shell input keyevent 82 & +# - ./gradlew connectedAndroidTest +# - adb -s testApi27 emu kill + +#expanded_test: +# image: "0xacab.org:4567/leap/bitmask_android/android-emulator:latest" +# stage: test +# script: +# - emulator -avd testApi27 -no-audio -no-window & +# - .gitlab/wait-for-emulator.sh +# - adb devices +# - adb shell settings put global window_animation_scale 0 & +# - adb shell settings put global transition_animation_scale 0 & +# - adb shell settings put global animator_duration_scale 0 & +# - adb shell input keyevent 82 & +# - ./gradlew connectedAndroidTest +# - ./gradlew createProductionDebugCoverageReport +# - adb -s testApi27 emu kill +# - ./gradlew test +# artifacts: +# expire_in: 3 days +# paths: +# - app/build/reports/androidTests/connected/ +# - app/build/reports/coverage/production/ +# - app/build/tests/ +# when: manual + 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_deps.sh + - ./gradlew clean assembleDebug --stacktrace artifacts: paths: - app/build/outputs/ @@ -72,11 +108,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 - - ./gradlew assembleProductionRelease - - ./gradlew assembleProductionBeta + - ./cleanProject.sh + - ./build_deps.sh + - ./gradlew assembleProductionRelease --stacktrace + - ./gradlew assembleProductionBeta --stacktrace artifacts: paths: - app/build/outputs/ |