From cd27cc89d6f63f97212fe00caf42c2348c64b18d Mon Sep 17 00:00:00 2001 From: Schoumi Date: Thu, 12 Jan 2017 18:45:13 +0000 Subject: [PATCH 1/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 57659c6..afe75f6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Goblim +[![build status](https://git.mob-dev.fr/Schoumi/Goblim/badges/master/build.svg)](https://git.mob-dev.fr/Schoumi/Goblim/commits/master) + Goblim is an Android application. Goblim let your share your photos on the Lut.im server of your choice. Use your own server to regain control of your privacy! From a9a2d949fb63d2c6f886d848336f0e045fdea3cd Mon Sep 17 00:00:00 2001 From: Schoumi Date: Thu, 12 Jan 2017 18:49:10 +0000 Subject: [PATCH 2/6] Add .gitlab-ci.yml --- .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..a63c01c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,32 @@ +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "25" + ANDROID_BUILD_TOOLS: "24.0.3" + ANDROID_SDK_TOOLS: "25.2.4" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.tgz https://dl.google.com/android/android-sdk_r${ANDROID_SDK_TOOLS}-linux.tgz + - tar --extract --gzip --file=android-sdk.tgz + - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK} + - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools + - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS} + - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository + - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services + - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + +stages: + - build + +build: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ \ No newline at end of file From 3d2925eb483db39da2bc0f31f03939a62821cfdb Mon Sep 17 00:00:00 2001 From: Schoumi Date: Thu, 12 Jan 2017 18:54:48 +0000 Subject: [PATCH 3/6] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a63c01c..86e8a50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,6 @@ variables: ANDROID_SDK_TOOLS: "25.2.4" before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - wget --quiet --output-document=android-sdk.tgz https://dl.google.com/android/android-sdk_r${ANDROID_SDK_TOOLS}-linux.tgz - tar --extract --gzip --file=android-sdk.tgz - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK} From c3e9a30810ae21c4f1403a62b6b3b8651c7940c8 Mon Sep 17 00:00:00 2001 From: Schoumi Date: Thu, 12 Jan 2017 21:01:25 +0000 Subject: [PATCH 4/6] Update .gitlab-ci.yml --- .gitlab-ci.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86e8a50..9e685d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,20 +3,23 @@ image: openjdk:8-jdk variables: ANDROID_COMPILE_SDK: "25" ANDROID_BUILD_TOOLS: "24.0.3" - ANDROID_SDK_TOOLS: "25.2.4" + ANDROID_SDK_TOOLS: "25.2.3" before_script: - - wget --quiet --output-document=android-sdk.tgz https://dl.google.com/android/android-sdk_r${ANDROID_SDK_TOOLS}-linux.tgz - - tar --extract --gzip --file=android-sdk.tgz - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK} - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS} - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/tools_r${ANDROID_SDK_TOOLS}-linux.zip + - mkdir -p sdk + - cd sdk + - unzip -o -qq ../android-sdk.zip + - echo y | tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK} + - echo y | tools/android --silent update sdk --no-ui --all --filter platform-tools + - echo y | tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS} + - echo y | tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository + - echo y | tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services + - echo y | tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository + - cd .. + - export ANDROID_HOME=$PWD/sdk + - export PATH=$PATH:$PWD/sdk/platform-tools/ + - gradle wrapper stages: - build From eecc86e8a972010aee28a1db7c59aa22e40e1dba Mon Sep 17 00:00:00 2001 From: Schoumi Date: Thu, 12 Jan 2017 23:44:03 +0000 Subject: [PATCH 5/6] Update .gitlab-ci.yml --- .gitlab-ci.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e685d9..694aa90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,10 @@ image: openjdk:8-jdk variables: - ANDROID_COMPILE_SDK: "25" - ANDROID_BUILD_TOOLS: "24.0.3" - ANDROID_SDK_TOOLS: "25.2.3" + GRADLE_VERSION: "2.14.1" before_script: - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/tools_r${ANDROID_SDK_TOOLS}-linux.zip - - mkdir -p sdk - - cd sdk - - unzip -o -qq ../android-sdk.zip - - echo y | tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK} - - echo y | tools/android --silent update sdk --no-ui --all --filter platform-tools - - echo y | tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS} - - echo y | tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository - - echo y | tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services - - echo y | tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository - - cd .. - - export ANDROID_HOME=$PWD/sdk - - export PATH=$PATH:$PWD/sdk/platform-tools/ - - gradle wrapper + - gradle wrapper --gradle-version ${GRADLE_VERSION} -Dcom.android.build.gradle.overrideVersionCheck=true stages: - build From 7e9235fc0a4d72b697f6f63424a90a3320d82a22 Mon Sep 17 00:00:00 2001 From: Schoumi Date: Thu, 12 Jan 2017 23:53:37 +0000 Subject: [PATCH 6/6] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index afe75f6..5c2a63e 100644 --- a/README.md +++ b/README.md @@ -16,3 +16,6 @@ Goblim let your share your photos on the Lut.im server of your choice. Use your Lut.im "Let's Upload That Image" is an open source image sharing server you can install on your own machine (self-hosting, VPS, dedicated, cloud). See https://github.com/ldidry/lutim Download it on the playstore: https://play.google.com/store/apps/details?id=fr.mobdev.goblim + +
+ \ No newline at end of file