From 55ce662292fff88400efb6982a02e398da6dedf6 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Tue, 3 Sep 2024 18:09:49 +0530
Subject: [PATCH 1/3] refactor(updates): rename dev -> community, stable ->
 official

---
 .gitlab-ci.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32977fdd..28e7e53b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@ variables:
   PROJECT_ID: "83" # under Settings -> General
   APK_PATH: "app/build/outputs/apk/ose/release"
   UNSIGNED_APK: "davx5-ose-release-unsigned.apk"
-  DEV_APK: "Account-manager-dev.apk"
-  STABLE_APK: "Account-manager-stable.apk"
+  COMMUNITY_APK: "Account-manager-community.apk"
+  OFFICIAL_APK: "Account-manager-official.apk"
 
 stages:
   - update-from-upstream
   - build
-  - release
+  - gitlab_release
 
 before_script:
   - echo email.key=$PEPPER >> local.properties
@@ -49,7 +49,7 @@ build:
       - app/build/outputs/apk/ose/
 
 init_submodules:
-  stage: release
+  stage: gitlab_release
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: on_success
@@ -62,7 +62,7 @@ init_submodules:
       - systemAppsUpdateInfo/
 
 generate-apks:
-  stage: release
+  stage: gitlab_release
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: on_success
@@ -77,15 +77,15 @@ generate-apks:
   script:
     - |
       ./systemAppsUpdateInfo/scripts/generate-apks.sh \
-      "$APK_PATH" "$UNSIGNED_APK" "$DEV_APK" "$STABLE_APK"
+      "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK"
   artifacts:
     paths:
       - $APK_PATH/$UNSIGNED_APK
-      - $APK_PATH/$DEV_APK
-      - $APK_PATH/$STABLE_APK
+      - $APK_PATH/$COMMUNITY_APK
+      - $APK_PATH/$OFFICIAL_APK
 
 create-json-files:
-  stage: release
+  stage: gitlab_release
   dependencies:
     - init_submodules
     - generate-apks
@@ -100,14 +100,14 @@ create-json-files:
   script:
     - |
       ./systemAppsUpdateInfo/scripts/create-json-files.sh \
-      "$APK_PATH" "$UNSIGNED_APK" "$DEV_APK" "$STABLE_APK"
+      "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK"
   artifacts:
     paths:
-      - dev.json
-      - stable.json
+      - community.json
+      - official.json
 
 create-release:
-  stage: release
+  stage: gitlab_release
   dependencies:
     - init_submodules
   needs:
@@ -122,7 +122,7 @@ create-release:
   script:
     - |
       ./systemAppsUpdateInfo/scripts/create-release.sh \
-      "$APK_PATH" "$UNSIGNED_APK" "$DEV_APK" "$STABLE_APK"
+      "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK"
 
 .update-from-upstream:
   stage: update-from-upstream
-- 
GitLab


From ddd8b07db9ebb5b011c35ab517f1aaeafb84f991 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Wed, 4 Sep 2024 03:00:42 +0530
Subject: [PATCH 2/3] refactor: use clone instead of submodule

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28e7e53b..141300c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,12 +54,10 @@ init_submodules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: on_success
   script:
-    - |
-      git submodule add --force \
-      https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo
+    - git clone https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo
   artifacts:
     paths:
-      - systemAppsUpdateInfo/
+      - systemAppsUpdateInfo/scripts/
 
 generate-apks:
   stage: gitlab_release
-- 
GitLab


From 700c6836abc1165c9a969d8fc2721cb626892890 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Wed, 4 Sep 2024 15:21:31 +0530
Subject: [PATCH 3/3] refactor: use underscores in the APK names

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 141300c8..6e519ba5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ variables:
   PROJECT_ID: "83" # under Settings -> General
   APK_PATH: "app/build/outputs/apk/ose/release"
   UNSIGNED_APK: "davx5-ose-release-unsigned.apk"
-  COMMUNITY_APK: "Account-manager-community.apk"
-  OFFICIAL_APK: "Account-manager-official.apk"
+  COMMUNITY_APK: "Account_manager_community.apk"
+  OFFICIAL_APK: "Account_manager_official.apk"
 
 stages:
   - update-from-upstream
-- 
GitLab