Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix GitlabCI and improve CMake support

Browse Source 
Do not use mirrors which may be out of sync
This commit is contained in:
Gioacchino Mazzurco 2023-11-27 00:06:12 +01:00
parent 678357ab2a
commit 3f40837b1c
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build_scripts/GitlabCI/base.Dockerfile
View File

@ -40,18 +40,23 @@ RUN git clone --depth 1 https://github.com/aetilius/pHash.git && \
rm -rf pHash-build pHash rm -rf pHash-build pHash
ARG FRESHCLONE=0 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_BRANCH=master
ARG REPO_DEPTH="--depth 2000" 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 fetch --tags && \
git submodule update --init --remote --force \ git submodule update --init \
libbitdht/ libretroshare/ openpgpsdk/ && \ libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ \
cd .. supportlibs/restbed/ && \
cd supportlibs/restbed/ && \
git submodule update --init \
dependency/asio/ dependency/kashmir/ && \
cd ../../../
RUN \ RUN \
mkdir RetroShare-build && cd RetroShare-build && \ mkdir RetroShare-build && cd RetroShare-build && \
cmake -B. -S../RetroShare/retroshare-service \ 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 && \
make -j$(nproc) && make install && \ make -j$(nproc) -j1 && make install && \
cd .. && rm -rf RetroShare-build cd .. && rm -rf RetroShare-build

8
build_scripts/GitlabCI/gitlabCI.Dockerfile
View File

@ -2,19 +2,19 @@ FROM registry.gitlab.com/retroshare/retroshare:base
RUN apt-get update -y && apt-get upgrade -y 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 ARG REPO_BRANCH=master
RUN \ RUN \
cd RetroShare && git remote add testing $REPO_URL && \ cd RetroShare && git remote add testing $REPO_URL && \
git fetch --tags testing $REPO_BRANCH && \ git fetch --tags testing $REPO_BRANCH && \
git reset --hard testing/$REPO_BRANCH && \ git reset --hard testing/$REPO_BRANCH && \
git submodule update --init --remote --force \ git submodule update --init \
libbitdht/ libretroshare/ openpgpsdk/ && \ libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ && \
git --no-pager log --max-count 1 git --no-pager log --max-count 1
RUN \ RUN \
mkdir RetroShare-build && cd RetroShare-build && \ mkdir RetroShare-build && cd RetroShare-build && \
cmake -B. -S../RetroShare/retroshare-service \ 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 && \ -DRS_WARN_DEPRECATED=OFF -DRS_WARN_LESS=ON && \
make -j$(nproc) && make install && \ make -j$(nproc) && make install && \
cd .. && rm -rf RetroShare-build cd .. && rm -rf RetroShare-build

2
libretroshare

@ -1 +1 @@
Subproject commit 6ef55dd3b0f7b1d8e56143a50b7ad4fa6859ab74 Subproject commit 78739f1eb504503b12f107109356624da49e75ef

4
retroshare-service/CMakeLists.txt
View File

@ -95,7 +95,7 @@ if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/CMakeLists.txt" )
else() else()
FetchContent_Declare( FetchContent_Declare(
libretroshare libretroshare
GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git" GIT_REPOSITORY "https://github.com/RetroShare/libretroshare.git"
GIT_TAG "origin/master" GIT_TAG "origin/master"
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
GIT_PROGRESS TRUE GIT_PROGRESS TRUE
@ -151,7 +151,7 @@ if(RS_WEBUI)
else() else()
FetchContent_Declare( FetchContent_Declare(
webui webui
GIT_REPOSITORY "https://gitlab.com/RetroShare/RetroShareWebUI.git" GIT_REPOSITORY "https://github.com/RetroShare/RSNewWebUI.git"
GIT_TAG "origin/master" GIT_TAG "origin/master"
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
GIT_PROGRESS TRUE GIT_PROGRESS TRUE