FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

Update mirror.yml

Browse Source 
use svn metadata
This commit is contained in:
sidey79 2021-11-07 11:57:42 +01:00 committed by GitHub
parent 149016246c
commit f507e48c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/mirror.yml vendored
View File

@ -62,7 +62,7 @@ jobs:
if [[ ! -d "${GITHUB_WORKSPACE}/src/fhem-mirror/.git" ]]; then if [[ ! -d "${GITHUB_WORKSPACE}/src/fhem-mirror/.git" ]]; then
git init "${GITHUB_WORKSPACE}/src/fhem-mirror" ; git init "${GITHUB_WORKSPACE}/src/fhem-mirror" ;
cd "${GITHUB_WORKSPACE}/src/fhem-mirror"; cd "${GITHUB_WORKSPACE}/src/fhem-mirror";
git svn init --trunk=trunk --prefix=svn/ --no-metadata https://svn.fhem.de/fhem ; git svn init --trunk=trunk --prefix=svn/ https://svn.fhem.de/fhem ;
git config --add svn-remote.svn.preserve-empty-dirs "true" ; git config --add svn-remote.svn.preserve-empty-dirs "true" ;
git config --add svn-remote.svn.placeholder-filename ".gitkeep" ; git config --add svn-remote.svn.placeholder-filename ".gitkeep" ;
git config --add svn.authorsfile "${GITHUB_WORKSPACE}/authors_merged.txt" ; git config --add svn.authorsfile "${GITHUB_WORKSPACE}/authors_merged.txt" ;
@ -82,6 +82,7 @@ jobs:
RET=0 RET=0
timeout 1200 git svn -q fetch || timeout 120 git svn -q fetch || RET=$?; # Limit each run to 20 minutes to not overload fhem.de servers and build cache in chunks timeout 1200 git svn -q fetch || timeout 120 git svn -q fetch || RET=$?; # Limit each run to 20 minutes to not overload fhem.de servers and build cache in chunks
if [[ $RET == 0 ]]; then if [[ $RET == 0 ]]; then
git config --unset svn-remote.svn.noMetadata;
git checkout -f "master" git checkout -f "master"
#git rebase "remotes/svn/trunk" #git rebase "remotes/svn/trunk"
git svn rebase "remotes/svn/trunk" git svn rebase "remotes/svn/trunk"