Merge pull request #264 from genofire/ci

Build with CIs

3 files changed, 83 insertions, 1 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..49088ef81
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,44 @@
+version: 2
+jobs:
+  test:
+    docker:
+      - image: registry.gitlab.com/fdroid/ci-images-client:latest
+    steps:
+      - checkout
+      - restore_cache:
+          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
+      - save_cache:
+          paths:
+            - .gradle/caches
+            - .gradle/wrapper
+          key: gradle-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }}
+      - store_artifacts:
+          path: build/outputs/apk/standard
+          destination: apk
+  build:
+    docker:
+      - image: registry.gitlab.com/fdroid/ci-images-client:latest
+    steps:
+      - checkout
+      - restore_cache:
+          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:
+            - ~/.android
+          key: android
+      - store_artifacts:
+          path: build/outputs/apk/standard
+          destination: apk
+
+workflows:
+  version: 2
+  build_test:
+    jobs:
+    - build
+    - test
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..9a4a3b3be
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,38 @@
+image: registry.gitlab.com/fdroid/ci-images-client:latest
+
+cache:
+  paths:
+    - .gradle/wrapper
+    - .gradle/caches
+    - .android
+
+stages:
+  - build
+  - test
+
+before_script:
+  - export GRADLE_USER_HOME=$PWD/.gradle
+  - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' build.gradle`
+  - echo y | sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" > /dev/null
+
+
+build:
+  stage: build
+  script:
+  - ./gradlew assembleStandard
+  artifacts:
+    paths:
+    - build/outputs/
+
+test:
+  stage: test
+  script:
+  - ./gradlew lint
+  artifacts:
+    paths:
+    - build/outputs/
+
+after_script:
+  # this file changes every time but should not be cached
+  - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
+  - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
diff --git a/README.md b/README.md
index 50bdca023..7886cb2ee 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![logo](/art/icon.png) 
-# Pix-Art Messenger
+# Pix-Art Messenger [![CircleCI](https://circleci.com/gh/kriztan/Pix-Art-Messenger/tree/master.svg?style=shield)](https://circleci.com/gh/kriztan/Pix-Art-Messenger/tree/master)
 
 Pix-Art Messenger ist eine Kopie der offiziellen Android-App [Conversations](https://github.com/siacs/Conversations) mit einigen Änderungen, insbesondere zur Verbesserung der Benutzerfreundlichkeit, um den Umstieg von oftmals vorinstallierten Messengern zu erleichtern.