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 
try linear commit histrory
This commit is contained in:
sidey79 2021-11-07 11:33:05 +01:00 committed by GitHub
parent 80d4680538
commit c6917c270d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,8 @@ jobs:
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
git checkout -f "master"
git rebase "remotes/svn/trunk"
#git rebase "remotes/svn/trunk"
git svn rebase -l
echo "::set-output name=SVN_FETCH_STATUS::complete"
elif [[ $RET != 124 ]]; then
echo "::set-output name=SVN_FETCH_STATUS::error"
@ -131,5 +132,5 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: main
directory: ./src/fhem-mirror
force: true
force: false
tags: true