diff options
| author | cyberta <cyberta@riseup.net> | 2017-09-27 14:25:14 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-09-27 14:25:14 +0000 |
| commit | 51afe1eeba990c2cd57bd842a96f7a756df51ce8 (patch) | |
| tree | 88a1dd563eb6917551e38e80b08cb70ac3260235 /.gitlab-ci.yml | |
| parent | d944721a35786a48b996ef088f0311b1835180a7 (diff) | |
| parent | bae5bd200f129955b396c066814efc103f0bb0b1 (diff) | |
Merge branch 'develop' into 'master'
update ndk and sdk for gitlab ci
See merge request leap/bitmask_android!7
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9e43504..bddbc547 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,12 +15,15 @@ variables: - docker-in-docker services: - docker:dind - script: - - docker --version - - docker info + + before_script: - > export LAST_COMMIT=$(curl -s --header "PRIVATE-TOKEN: ${LEAP_CODE_O_MATIC_PRIVATE_TOKEN}" https://0xacab.org/api/v4/projects/578/pipelines | python -c "import sys, json; print json.load(sys.stdin)[1]['sha']") + + script: + - docker --version + - docker info - .gitlab/build.sh ${DOCKER_IMAGE} docker_image:sdk: @@ -47,7 +50,7 @@ build: script: - git submodule sync --recursive - git submodule update --init --recursive - - ./gradlew assembleDebug + - ./gradlew clean assembleDebug artifacts: paths: - app/build/outputs/ |