From a59518ced9ef11b5b0fc0f8ee5926c1966a0ee23 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Thu, 8 Nov 2018 21:49:30 +0100 Subject: add .gitlab-ci.yml --- .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..020210902 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,28 @@ +image: registry.gitlab.com/fdroid/ci-images-client:latest + +cache: + paths: + - .gradle/wrapper + - .gradle/caches + +stages: + - build + +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/ + +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/ -- cgit v1.2.3 From 5eb53bcf1d456f9199397eaf00651c5a17edae45 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Thu, 8 Nov 2018 22:53:06 +0100 Subject: add circleci support --- .circleci/config.yml | 21 +++++++++++++++++++++ README.md | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..6b9f76d3e --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,21 @@ +version: 2 +jobs: + build: + docker: + - image: registry.gitlab.com/fdroid/ci-images-client:latest + steps: + - checkout + - restore_cache: + key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} + - 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 + - store_artifacts: + path: build/outputs/apk/standard + destination: apk + +workflows: + version: 2 + build_only: + jobs: + - build diff --git a/README.md b/README.md index 0fb614417..d97703202 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. -- cgit v1.2.3 From 3a714cf31e5037a9fea03e66c5a28546e4eaf55a Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Fri, 9 Nov 2018 09:57:09 +0100 Subject: ci add mini tests --- .circleci/config.yml | 26 +++++++++++++++++++++++++- .gitlab-ci.yml | 9 +++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6b9f76d3e..0b2c076b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,15 +1,38 @@ version: 2 jobs: + test: + docker: + - image: registry.gitlab.com/fdroid/ci-images-client:latest + steps: + - checkout + - restore_cache: + key: gradle + - 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 + - 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: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} + key: gradle - 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 - store_artifacts: path: build/outputs/apk/standard destination: apk @@ -19,3 +42,4 @@ workflows: build_only: jobs: - build + - test diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 020210902..820d72a5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ cache: stages: - build + - test before_script: - export GRADLE_USER_HOME=$PWD/.gradle @@ -22,6 +23,14 @@ build: paths: - build/outputs/ +build: + 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 -- cgit v1.2.3 From 9a4577340fbb9be0f3242bc704d598ef66a0f41e Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Fri, 9 Nov 2018 10:00:56 +0100 Subject: ci: add .android to cache for keep same keystore for signing --- .circleci/config.yml | 13 ++++++------- .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 -- cgit v1.2.3