From 5a940a3baf712660fd3620c902fb005eb875438e Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Thu, 21 Mar 2019 21:56:05 +0300
Subject: [PATCH] build: update gitlab config

---
 .gitlab-ci.yml | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 247b141fe..6e323d456 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,32 @@
-image: java:8
-
 variables:
-    GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-    TERM: "dumb"
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
+  TERM: "dumb"
 
 before_script:
-    - chmod +x gradlew
+  - chmod +x gradlew
 
 stages:
-  - build
+  - test
+  - check
 
-build:
-  stage: build
-  before_script:
-    - export JADX_LAST_TAG="$(git describe --abbrev=0 --tags)"
-    - export JADX_VERSION="${JADX_LAST_TAG:1}-$(git rev-parse --short HEAD)"
+java-8:
+  stage: test
+  image: openjdk:8
+  script: ./gradlew clean build
+
+java-11:
+  stage: test
+  image: openjdk:11
+  script: ./gradlew clean build
+
+check:
+  stage: check
+  image: openjdk:8
   script:
-    - ./gradlew -g /cache/.gradle clean build jacocoTestReport
-    - ./gradlew -g /cache/.gradle clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN
-    - ./gradlew -g /cache/.gradle clean dist
+    - export JADX_LAST_TAG="$(git describe --abbrev=0 --tags)"
+    - export JADX_VERSION="${JADX_LAST_TAG:1}-dev-$(git rev-parse --short HEAD)"
+    - ./gradlew clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN -Dsonar.branch.name=dev
+    - ./gradlew clean dist
   artifacts:
     paths:
-    - build/jadx*.zip
-    - build/jadx*.exe
+      - build/jadx*.zip