From c36573e3f66b1904028b3a0c4dbcdd2a9f008453 Mon Sep 17 00:00:00 2001
From: Distopico Vegan <distopico@riseup.net>
Date: Tue, 13 Nov 2018 00:11:26 -0500
Subject: [PATCH] clean CI config

---
 .gitlab-ci.yml | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59df8679..381f0803 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,34 +42,30 @@ lintAll:
   except:
     - master
   script:
-    - echo ""
-    #- ./gradlew --console=plain lint
-    #- ./gradlew --console=plain checkstyle
+    - ./gradlew --console=plain lint
+    - ./gradlew --console=plain checkstyle
 
 lintRelease:
   stage: test
   only:
     - master
   script:
-    - echo ""
-    #- ./gradlew --console=plain lintRelease
-    #- ./gradlew --console=plain checkstyle
+    - ./gradlew --console=plain lintRelease
+    - ./gradlew --console=plain checkstyle
 
 testAll:
   stage: test
   except:
     - master
   script:
-    - echo ""
-    #- ./gradlew --console=plain test
+    - ./gradlew --console=plain test
 
 testRelease:
   stage: test
   only:
     - master
   script:
-    - echo ""
-    #- ./gradlew --console=plain testReleaseUnitTest
+    - ./gradlew --console=plain testReleaseUnitTest
 
 buildDebug:
   stage: build
@@ -87,8 +83,7 @@ buildRelease:
   only:
     - master
   script:
-    - echo ""
-    #- ./gradlew assembleRelease
+    - ./gradlew assembleRelease
   artifacts:
     expire_in: 1 week
     paths:
@@ -102,22 +97,11 @@ release:
     - wget --quiet --output-document=/tmp/nvm-install.sh https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh
     - bash /tmp/nvm-install.sh
     - export NVM_DIR="$HOME/.nvm" &&. "$NVM_DIR/nvm.sh" && nvm install 8
-    #- eval $(ssh-agent -s)
-    #- echo "$GIT_SSH_KEY" | tr -d '\r' | ssh-add - > /dev/null
-    #- ssh-add <(echo "$GIT_SSH_KEY")
-    #- mkdir -p ~/.ssh && ssh-keyscan $GITLAB_URL >> ~/.ssh/known_hosts
-    #- git config --global user.email $GIT_AUTHOR_EMAIL
-    #- git config --global user.name $GIT_AUTHOR_NAME
+    - npm install -g semantic-release @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/exec @semantic-release/git @semantic-release/gitlab
   cache: {}
   script:
-    - npm install -g semantic-release @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/exec @semantic-release/git @semantic-release/gitlab
     - semantic-release
-    - echo git show --summary
-    - git checkout develop
-    - git rebase master
-    - git show --summary
     - git fetch
+    - git checkout develop
     - git rebase origin/master
-    - git show --summary
-    #- git push git@${GITLAB_URL}:${CI_PROJECT_PATH}.git develop
     - git push https://${GIT_CREDENTIALS}@${GITLAB_URL}/${CI_PROJECT_PATH}.git develop