From 9844a42ff4dcc9c82fbd65ff452af5cc8a52fb84 Mon Sep 17 00:00:00 2001
From: ravenci <134-ravenci@git.qoto.org>
Date: Thu, 3 Dec 2020 13:25:09 +0700
Subject: [PATCH] add basic CI/CD script
---
.gitlab-ci.yml | 44 +++++++++++++++++++
.../main/java/com/mcdz/seeip/TileView.java | 4 +-
2 files changed, 46 insertions(+), 2 deletions(-)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..a8a2ac8
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,44 @@
+image: openjdk:8-jdk
+
+variables:
+ ANDROID_COMPILE_SDK: "28"
+ ANDROID_BUILD_TOOLS: "28.0.2"
+ ANDROID_SDK_TOOLS: "4333796"
+
+before_script:
+ - apt-get --quiet update --yes
+ - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
+ - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip
+ - unzip -d android-sdk-linux android-sdk.zip
+ - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
+ - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null
+ - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
+ - export ANDROID_HOME=$PWD/android-sdk-linux
+ - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
+ - chmod +x ./gradlew
+ # temporarily disable checking for EPIPE error and use yes to accept all licenses
+ - set +o pipefail
+ - yes | android-sdk-linux/tools/bin/sdkmanager --licenses
+ - set -o pipefail
+
+stages:
+ - build
+ - test
+
+lintDebug:
+ stage: build
+ script:
+ - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint
+
+assembleDebug:
+ stage: build
+ script:
+ - ./gradlew assembleDebug
+ artifacts:
+ paths:
+ - app/build/outputs/
+
+debugTests:
+ stage: test
+ script:
+ - ./gradlew -Pci --console=plain :app:testDebug
diff --git a/app/src/main/java/com/mcdz/seeip/TileView.java b/app/src/main/java/com/mcdz/seeip/TileView.java
index 5c5cce8..14fc831 100644
--- a/app/src/main/java/com/mcdz/seeip/TileView.java
+++ b/app/src/main/java/com/mcdz/seeip/TileView.java
@@ -143,7 +143,7 @@ public class TileView extends TileService {
public String getPublicIpAddress() throws IOException {
- URL connection = new URL("http://checkip.amazonaws.com/");
+ URL connection = new URL("http://api.ipify.org/");
URLConnection con = connection.openConnection();
String str;
BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
@@ -156,4 +156,4 @@ public class TileView extends TileService {
}
-}
\ No newline at end of file
+}
--
GitLab