diff options
| -rw-r--r-- | .circleci/config.yml | 13 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 3 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b2c076b8..49088ef81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: steps: - checkout - restore_cache: - key: gradle + key: gradle-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }} - run: export GRADLE_USER_HOME=$PWD/.gradle - run: echo y | sdkmanager "platforms;android-$(sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' build.gradle)" > /dev/null - run: ./gradlew lint @@ -14,7 +14,7 @@ jobs: paths: - .gradle/caches - .gradle/wrapper - key: gradle + key: gradle-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: build/outputs/apk/standard destination: apk @@ -24,22 +24,21 @@ jobs: steps: - checkout - restore_cache: - key: gradle + key: android - run: export GRADLE_USER_HOME=$PWD/.gradle - run: echo y | sdkmanager "platforms;android-$(sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' build.gradle)" > /dev/null - run: ./gradlew assembleStandard - save_cache: paths: - - .gradle/caches - - .gradle/wrapper - key: gradle + - ~/.android + key: android - store_artifacts: path: build/outputs/apk/standard destination: apk workflows: version: 2 - build_only: + build_test: jobs: - build - test diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 820d72a5a..9a4a3b3be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ cache: paths: - .gradle/wrapper - .gradle/caches + - .android stages: - build @@ -23,7 +24,7 @@ build: paths: - build/outputs/ -build: +test: stage: test script: - ./gradlew lint |