From 50698794a06d1603408ed43f3530ccf487cf9b5d Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 28 Dec 2018 11:13:26 +0100
Subject: [PATCH] Improve CI and re-enable tests in CI
---
.gitlab-ci.yml | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f0f7e2fd..11eb96058 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,6 @@ cache:
paths:
- ".gradle/wrapper"
- ".gradle/caches"
- policy: pull
before_script:
- "export GRADLE_USER_HOME=$(pwd)/.gradle"
@@ -21,9 +20,8 @@ before_script:
stages:
- "build"
-# - "test"
- - "deploy-local"
- - "deploy-beta"
+ - "test"
+ - "deploy"
build:
stage: "build"
@@ -34,13 +32,13 @@ build:
paths:
- "*.apk"
-#test:
-# stage: "test"
-# script:
-# - "./gradlew check"
+test:
+ stage: "test"
+ script:
+ - "./gradlew check"
deploy-local:
- stage: "deploy-local"
+ stage: "deploy"
image: "k8r.eu/justjanne/docker-s3cmd:latest"
cache: {}
only:
@@ -57,7 +55,7 @@ deploy-local:
- "s3cmd cp s3://releases/quasseldroid-ng/$VERSION s3://releases/quasseldroid-ng/Quasseldroid-latest.apk"
deploy-beta:
- stage: "deploy-beta"
+ stage: "deploy"
image: "k8r.eu/justjanne/docker-fastlane:latest"
cache: {}
only:
--
GitLab