From d3f405c01b75822fc320f5bc4e568b5627f04f5c Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Tue, 3 Jan 2023 19:59:10 +0600
Subject: [PATCH 1/2] 6450-Fix_account_creation_invitation_not_working

issue: https://gitlab.e.foundation/e/backlog/-/issues/6450

email.key was not setting for build job. So the email invitation doesn't
work. This MR fixes that issue.
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df5c550ac..8bbfb5c5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ cache:
 build:
   stage: build
   before_script:
+    - echo email.key=$PEPPER >> local.properties
     - git submodule sync
     - git submodule update --init --recursive --force
   script:
-- 
GitLab


From dab9f5f05bcfda1ff77fd1788e3f893da33a0df3 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Tue, 3 Jan 2023 20:35:43 +0600
Subject: [PATCH 2/2] replace submodule sync with gitlab ci

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bbfb5c5d..00cb60995 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
   - build
 
 before_script:
-  - echo email.key $PEPPER >> local.properties
+  - echo email.key=$PEPPER >> local.properties
   - export GRADLE_USER_HOME=$(pwd)/.gradle
   - chmod +x ./gradlew
 
@@ -16,10 +16,8 @@ cache:
 
 build:
   stage: build
-  before_script:
-    - echo email.key=$PEPPER >> local.properties
-    - git submodule sync
-    - git submodule update --init --recursive --force
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   script:
     - ./gradlew build -x test
   artifacts:
-- 
GitLab