Skip to content

Commit

Permalink
Merge branch 'gitlab-ci' into develop
Browse files Browse the repository at this point in the history
We now use gitlab-ci, mostly due to unresolvable OOM errors in Circle CI

* gitlab-ci:
  README: Fix typo
  README: use gitlab CI badge
  Delete circle.yml.
  Add gitlab-ci.yml
  • Loading branch information
AlvaroBrey committed Aug 20, 2018
2 parents ca4d7b6 + dea7c84 commit 2022bce
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 61 deletions.
28 changes: 28 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
image: circleci/android:api-27-alpha

before_script:
- export GRADLE_USER_HOME="$(pwd)/.gradle"
- export GRADLE_OPTS='-Dorg.gradle.daemon=false'

cache:
paths:
- .gradle

stages:
- build

build:
stage: build
script:
- ./gradlew assembleCiDebug
- ./gradlew testCiDebugUnitTest
- ./gradlew jacocoTestReportCiDebug
- awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions, "% covered" }' Calendula/build/reports/jacoco/ciDebug/jacoco.csv
- if grep -r '* Created by' Calendula/src/; then exit 1; fi
artifacts:
paths:
- Calendula/build/outputs/
- Calendula/build/reports/tests/
- Calendula/build/test-results/
- Calendula/build/reports/jacoco/
expire_in: 1 week
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
![](https://tec.citius.usc.es/calendula/github-assets/calendula_promo_google_play.png)
# Calendula [![CircleCI](https://circleci.com/gh/citiususc/calendula/tree/develop.svg?style=shield)](https://circleci.com/gh/citiususc/calendula/tree/develop)
# Calendula [![Gitlab CI](https://gitlab.com/calendula-ci/calendula/badges/develop/build.svg)](https://gitlab.com/calendula-ci/calendula/pipelines)

Calendula is an Android assistant for personal medication management, aimed at those who have trouble following their medication regimen, forget to take their drugs, or have complex schedules that are difficult to remember.

Expand Down
60 changes: 0 additions & 60 deletions circle.yml

This file was deleted.

0 comments on commit 2022bce

Please sign in to comment.