From 36e93e0cd2ba8f01f8ebb599e8e6c716248222b9 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 11:15:24 +0100
Subject: [PATCH 01/16] Public Light on Apps

---
 .gitlab-ci.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35e0b5d..3725085 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest
 
 stages:
 - build
+- publish
 
 before_script:
 - git submodule update --init --recursive
@@ -20,3 +21,22 @@ build:
   artifacts:
     paths:
     - app/build/outputs/apk/
+
+publish-to-apps:
+  stage: publish
+  variables:
+    APP_NAME: "Light"
+    APP_PACKAGE_NAME: "foundation.e.light"
+    APP_AUTHOR: "eFoundation"
+    APP_ICON_PATH: ""
+    APP_CATEGORY: "default_app"
+    APP_DESCRIPTION: "Transforms dark into a lovely place"
+    APP_LICENSE: "Apache 2.0"
+    APP_VERSION_NUMBER: "4.1.0"
+    APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
+  script:
+  - |
+    curl -v -k -i \
+      -H "Accept: application/json" \
+      -X POST -d $APP_JSON \
+       https://updates.ecloud.global:8443/push.php
-- 
GitLab


From f1a977b261fc664f814216d1f23c88206b1ba7f0 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 11:17:23 +0100
Subject: [PATCH 02/16] Test

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3725085..736f683 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest"
 
 stages:
-- build
+#- build
 - publish
 
 before_script:
@@ -14,7 +14,7 @@ cache:
   paths:
   - .gradle/
 
-build:
+.build:
   stage: build
   script:
   - ./gradlew build
-- 
GitLab


From 53f2e38bc67cd01805a7fd95ba3eaa860228aa72 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 11:18:34 +0100
Subject: [PATCH 03/16] test

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 736f683..b0f81d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,7 @@ publish-to-apps:
     APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
   script:
   - |
+    echo $APP_JSON
     curl -v -k -i \
       -H "Accept: application/json" \
       -X POST -d $APP_JSON \
-- 
GitLab


From 4e5f8e7ca8dca347a49fb1991e7a591dd8d2dbe3 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 11:20:38 +0100
Subject: [PATCH 04/16] remove verbose

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0f81d5..83da2c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ publish-to-apps:
   script:
   - |
     echo $APP_JSON
-    curl -v -k -i \
+    curl -k -i \
       -H "Accept: application/json" \
       -X POST -d $APP_JSON \
        https://updates.ecloud.global:8443/push.php
-- 
GitLab


From 05d52670d6f1db1c6afee9859233a128c2afe876 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 11:29:13 +0100
Subject: [PATCH 05/16] Test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83da2c7..5865002 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ publish-to-apps:
     APP_DESCRIPTION: "Transforms dark into a lovely place"
     APP_LICENSE: "Apache 2.0"
     APP_VERSION_NUMBER: "4.1.0"
-    APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
+    APP_JSON: {"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}
   script:
   - |
     echo $APP_JSON
-- 
GitLab


From b88cae8fab2ada7c2174f9a331c1e9d4337daf95 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 11:41:19 +0100
Subject: [PATCH 06/16] Fix

---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5865002..d2ed34e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,11 +33,12 @@ publish-to-apps:
     APP_DESCRIPTION: "Transforms dark into a lovely place"
     APP_LICENSE: "Apache 2.0"
     APP_VERSION_NUMBER: "4.1.0"
-    APP_JSON: {"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}
+    APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
   script:
   - |
-    echo $APP_JSON
+    echo "$APP_JSON"
     curl -k -i \
+      -H 'Content-Type: application/json' \
       -H "Accept: application/json" \
-      -X POST -d $APP_JSON \
+      -X POST -d "$APP_JSON" \
        https://updates.ecloud.global:8443/push.php
-- 
GitLab


From 88b621dc154e1f6522e38fff1a7d675b819dfec4 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:10:03 +0100
Subject: [PATCH 07/16] Dynamic variables

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2ed34e..0c2b5b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ publish-to-apps:
   stage: publish
   variables:
     APP_NAME: "Light"
-    APP_PACKAGE_NAME: "foundation.e.light"
+    APP_PACKAGE_NAME: "$(sed -n 's/.*package="\(.*\)"/\1/p' app/src/main/AndroidManifest.xml)"
     APP_AUTHOR: "eFoundation"
     APP_ICON_PATH: ""
     APP_CATEGORY: "default_app"
-- 
GitLab


From 8419774c6047b06fa83fca82c6a2bf2d4e2d5d04 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:14:05 +0100
Subject: [PATCH 08/16] Fix

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c2b5b6..b285eff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ publish-to-apps:
   stage: publish
   variables:
     APP_NAME: "Light"
-    APP_PACKAGE_NAME: "$(sed -n 's/.*package="\(.*\)"/\1/p' app/src/main/AndroidManifest.xml)"
+    APP_PACKAGE_NAME: "$(sed -n 's/.*package=\"\\(.*\\)\"/\\1/p' app/src/main/AndroidManifest.xml)"
     APP_AUTHOR: "eFoundation"
     APP_ICON_PATH: ""
     APP_CATEGORY: "default_app"
-- 
GitLab


From 597d7f197c37ebc8a2f06622866f4c4ec8c9b8ff Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:17:37 +0100
Subject: [PATCH 09/16] Test

---
 .gitlab-ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b285eff..1d17bbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,6 @@ publish-to-apps:
   stage: publish
   variables:
     APP_NAME: "Light"
-    APP_PACKAGE_NAME: "$(sed -n 's/.*package=\"\\(.*\\)\"/\\1/p' app/src/main/AndroidManifest.xml)"
     APP_AUTHOR: "eFoundation"
     APP_ICON_PATH: ""
     APP_CATEGORY: "default_app"
@@ -36,6 +35,14 @@ publish-to-apps:
     APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
   script:
   - |
+
+    if [ -n APP_PACKAGE_NAME ]
+    then
+      echo "Define package_name"
+      APP_PACKAGE_NAME=$(sed -n 's/.*package=\"\\(.*\\)\"/\\1/p' app/src/main/AndroidManifest.xml)
+    fi
+
+
     echo "$APP_JSON"
     curl -k -i \
       -H 'Content-Type: application/json' \
-- 
GitLab


From 5a836c5eff7e5ac1589ac4d1454de37fff262985 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:18:16 +0100
Subject: [PATCH 10/16] Fix

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d17bbc..95ac275 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ publish-to-apps:
     if [ -n APP_PACKAGE_NAME ]
     then
       echo "Define package_name"
-      APP_PACKAGE_NAME=$(sed -n 's/.*package=\"\\(.*\\)\"/\\1/p' app/src/main/AndroidManifest.xml)
+      APP_PACKAGE_NAME=$(sed -n 's/.*package="\(.*\)"/\1/p' app/src/main/AndroidManifest.xml)
     fi
 
 
-- 
GitLab


From 04bc1cc9210d886eee2339535f73d16385578438 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:20:22 +0100
Subject: [PATCH 11/16] Fix

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95ac275..ed32c37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,6 @@ publish-to-apps:
     APP_DESCRIPTION: "Transforms dark into a lovely place"
     APP_LICENSE: "Apache 2.0"
     APP_VERSION_NUMBER: "4.1.0"
-    APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
   script:
   - |
 
@@ -42,6 +41,8 @@ publish-to-apps:
       APP_PACKAGE_NAME=$(sed -n 's/.*package="\(.*\)"/\1/p' app/src/main/AndroidManifest.xml)
     fi
 
+    APP_JSON='{"name":"'$APP_NAME'","package_name":"'$APP_PACKAGE_NAME'","author":"'$APP_AUTHOR'","icon_image_path":"'$APP_ICON_PATH'","category":"'$APP_CATEGORY'","description":"'$APP_DESCRIPTION'","licence":"'$APP_LICENSE'","latest_version_number":"'$APP_VERSION_NUMBER'"}'
+
 
     echo "$APP_JSON"
     curl -k -i \
-- 
GitLab


From 132cf48c1e486fdd0ee647941bfa1b4e435af5f2 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:26:25 +0100
Subject: [PATCH 12/16] Final

---
 .gitlab-ci.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed32c37..57afed8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,24 +27,17 @@ publish-to-apps:
   variables:
     APP_NAME: "Light"
     APP_AUTHOR: "eFoundation"
+    APP_PACKAGE_NAME: "foundation.e.foundation"
     APP_ICON_PATH: ""
     APP_CATEGORY: "default_app"
     APP_DESCRIPTION: "Transforms dark into a lovely place"
     APP_LICENSE: "Apache 2.0"
     APP_VERSION_NUMBER: "4.1.0"
+    APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
   script:
   - |
-
-    if [ -n APP_PACKAGE_NAME ]
-    then
-      echo "Define package_name"
-      APP_PACKAGE_NAME=$(sed -n 's/.*package="\(.*\)"/\1/p' app/src/main/AndroidManifest.xml)
-    fi
-
-    APP_JSON='{"name":"'$APP_NAME'","package_name":"'$APP_PACKAGE_NAME'","author":"'$APP_AUTHOR'","icon_image_path":"'$APP_ICON_PATH'","category":"'$APP_CATEGORY'","description":"'$APP_DESCRIPTION'","licence":"'$APP_LICENSE'","latest_version_number":"'$APP_VERSION_NUMBER'"}'
-
-
     echo "$APP_JSON"
+    
     curl -k -i \
       -H 'Content-Type: application/json' \
       -H "Accept: application/json" \
-- 
GitLab


From 3261b4b22487342faf08d390e7a7c93fd795a8a8 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:50:17 +0100
Subject: [PATCH 13/16] Use template

---
 .gitlab-ci.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57afed8..a402032 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,24 +22,19 @@ cache:
     paths:
     - app/build/outputs/apk/
 
-publish-to-apps:
-  stage: publish
+include:
+  - project: 'e/apps/docker-android-apps-cicd'
+    ref: publish-apps
+    file: '/templates/gitlab-ci-publish-app.yml'
+
+apps:
+  extends: .publish to apps
   variables:
     APP_NAME: "Light"
     APP_AUTHOR: "eFoundation"
     APP_PACKAGE_NAME: "foundation.e.foundation"
     APP_ICON_PATH: ""
     APP_CATEGORY: "default_app"
-    APP_DESCRIPTION: "Transforms dark into a lovely place"
+    APP_DESCRIPTION: "light app"
     APP_LICENSE: "Apache 2.0"
     APP_VERSION_NUMBER: "4.1.0"
-    APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
-  script:
-  - |
-    echo "$APP_JSON"
-    
-    curl -k -i \
-      -H 'Content-Type: application/json' \
-      -H "Accept: application/json" \
-      -X POST -d "$APP_JSON" \
-       https://updates.ecloud.global:8443/push.php
-- 
GitLab


From d22fd0ea2f4d2d912e2da34859aaa4a0b8cdcf70 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 17:36:58 +0100
Subject: [PATCH 14/16] All process

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a402032..6fe7ef3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ cache:
   paths:
   - .gradle/
 
-.build:
+build:
   stage: build
   script:
   - ./gradlew build
@@ -38,3 +38,5 @@ apps:
     APP_DESCRIPTION: "light app"
     APP_LICENSE: "Apache 2.0"
     APP_VERSION_NUMBER: "4.1.0"
+    ICON_PATH: "app/src/main/res/mipmap-xxxhdpi/ic_launcher.png"
+    APK_PATH: "app/build/outputs/apk/debug/light-debug.apk"
-- 
GitLab


From d5124a3afe313ec768c5f5ab37bf3eb142c8d69d Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 17:37:42 +0100
Subject: [PATCH 15/16] Fix

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fe7ef3..9479ae4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest"
 
 stages:
-#- build
+- build
 - publish
 
 before_script:
-- 
GitLab


From 9805a7de273e88aa4c54c0af7c63589bbb9ecbce Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 18:23:51 +0100
Subject: [PATCH 16/16] Change package name

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9479ae4..5a4b64a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ apps:
   variables:
     APP_NAME: "Light"
     APP_AUTHOR: "eFoundation"
-    APP_PACKAGE_NAME: "foundation.e.foundation"
+    APP_PACKAGE_NAME: "foundation.e.light"
     APP_ICON_PATH: ""
     APP_CATEGORY: "default_app"
     APP_DESCRIPTION: "light app"
-- 
GitLab