From 3f40837b1c1043638465d1b55e7cf376b9c3b45d Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 27 Nov 2023 00:06:12 +0100
Subject: [PATCH] Fix GitlabCI and improve CMake support

Do not use mirrors which may be out of sync
---
 build_scripts/GitlabCI/base.Dockerfile     | 19 ++++++++++++-------
 build_scripts/GitlabCI/gitlabCI.Dockerfile |  8 ++++----
 libretroshare                              |  2 +-
 retroshare-service/CMakeLists.txt          |  4 ++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/build_scripts/GitlabCI/base.Dockerfile b/build_scripts/GitlabCI/base.Dockerfile
index 13097f58d..014b8fb04 100644
--- a/build_scripts/GitlabCI/base.Dockerfile
+++ b/build_scripts/GitlabCI/base.Dockerfile
@@ -40,18 +40,23 @@ RUN git clone --depth 1 https://github.com/aetilius/pHash.git && \
 	rm -rf pHash-build pHash
 
 ARG FRESHCLONE=0
-ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 ARG REPO_DEPTH="--depth 2000"
-RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && cd RetroShare && \
+RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && \
+	cd RetroShare && \
 	git fetch --tags && \
-	git submodule update --init --remote --force \
-		libbitdht/ libretroshare/ openpgpsdk/ && \
-	cd ..
+	git submodule update --init \
+		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ \
+		supportlibs/restbed/ && \
+	cd supportlibs/restbed/ && \
+	git submodule update --init \
+		dependency/asio/ dependency/kashmir/ && \
+	cd ../../../
 
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON && \
-	make -j$(nproc) && make install && \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON && \
+	make -j$(nproc) -j1 && make install && \
 	cd .. && rm -rf RetroShare-build
diff --git a/build_scripts/GitlabCI/gitlabCI.Dockerfile b/build_scripts/GitlabCI/gitlabCI.Dockerfile
index c62c4d198..5ae3f4ed3 100644
--- a/build_scripts/GitlabCI/gitlabCI.Dockerfile
+++ b/build_scripts/GitlabCI/gitlabCI.Dockerfile
@@ -2,19 +2,19 @@ FROM registry.gitlab.com/retroshare/retroshare:base
 
 RUN apt-get update -y && apt-get upgrade -y
 
-ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 RUN \
 	cd RetroShare && git remote add testing $REPO_URL && \
 	git fetch --tags testing $REPO_BRANCH && \
 	git reset --hard testing/$REPO_BRANCH && \
-	git submodule update --init --remote --force \
-		libbitdht/ libretroshare/ openpgpsdk/ && \
+	git submodule update --init \
+		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ && \
 	git --no-pager log --max-count 1
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON \
 		-DRS_WARN_DEPRECATED=OFF -DRS_WARN_LESS=ON && \
 	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build
diff --git a/libretroshare b/libretroshare
index 6ef55dd3b..78739f1eb 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 6ef55dd3b0f7b1d8e56143a50b7ad4fa6859ab74
+Subproject commit 78739f1eb504503b12f107109356624da49e75ef
diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index 443ca2227..c7560728e 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -95,7 +95,7 @@ if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/CMakeLists.txt" )
 else()
 	FetchContent_Declare(
 		libretroshare
-		GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
+		GIT_REPOSITORY "https://github.com/RetroShare/libretroshare.git"
 		GIT_TAG "origin/master"
 		GIT_SHALLOW TRUE
 		GIT_PROGRESS TRUE
@@ -151,7 +151,7 @@ if(RS_WEBUI)
 	else()
 		FetchContent_Declare(
 			webui
-			GIT_REPOSITORY "https://gitlab.com/RetroShare/RetroShareWebUI.git"
+			GIT_REPOSITORY "https://github.com/RetroShare/RSNewWebUI.git"
 			GIT_TAG "origin/master"
 			GIT_SHALLOW TRUE
 			GIT_PROGRESS TRUE