From 15d9ecce981f8670fb09de28945962fafc9b4829 Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Wed, 1 Jan 2020 12:42:15 +0200 Subject: [PATCH 1/3] Pointing RemoteDroidGuard submodule to fix, and updating all submodules to use dev branch --- .gitmodules | 10 +++++----- extern/RemoteDroidGuard | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 06b057a0f..71c4b600a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,20 +1,20 @@ [submodule "extern/UnifiedNlp"] path = extern/UnifiedNlp url = https://gitlab.e.foundation/e/apps/android_packages_apps_UnifiedNlp - branch = master + branch = dev [submodule "extern/GmsApi"] path = extern/GmsApi url = https://gitlab.e.foundation/e/apps/GmsApi - branch = master + branch = dev [submodule "extern/Wearable"] path = extern/Wearable url = https://gitlab.e.foundation/e/apps/Wearable - branch = master + branch = dev [submodule "extern/GmsLib"] path = extern/GmsLib url = https://gitlab.e.foundation/e/apps/GmsLib - bramch = master + bramch = dev [submodule "extern/RemoteDroidGuard"] path = extern/RemoteDroidGuard url = https://gitlab.e.foundation/e/apps/android_packages_apps_RemoteDroidGuard - branch = master + branch = dev diff --git a/extern/RemoteDroidGuard b/extern/RemoteDroidGuard index 821d63193..0c5c944a5 160000 --- a/extern/RemoteDroidGuard +++ b/extern/RemoteDroidGuard @@ -1 +1 @@ -Subproject commit 821d63193a57a9d60892712a29c5e39211bb60a3 +Subproject commit 0c5c944a54962a4c60cffa44785a36d7251df635 -- GitLab From 65785e6a19cde5365766390a31bc41cb94674b0c Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 2 Jan 2020 08:55:47 +0000 Subject: [PATCH 2/3] Fix syntax issue --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 71c4b600a..7baca207e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,7 +13,7 @@ [submodule "extern/GmsLib"] path = extern/GmsLib url = https://gitlab.e.foundation/e/apps/GmsLib - bramch = dev + branch = dev [submodule "extern/RemoteDroidGuard"] path = extern/RemoteDroidGuard url = https://gitlab.e.foundation/e/apps/android_packages_apps_RemoteDroidGuard -- GitLab From 70c5a3ea3579279efce7f48226368480ffda1cb4 Mon Sep 17 00:00:00 2001 From: Alexandru Chircu Date: Thu, 2 Jan 2020 13:41:00 +0200 Subject: [PATCH 3/3] We need recursive for submodules, as some of the submodules also have submodules --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8189f7d1..b7093f704 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - build variables: - GIT_SUBMODULE_STRATEGY: normal + GIT_SUBMODULE_STRATEGY: recursive before_script: - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi -- GitLab