From 6f7162d0b8de75252bef770925c86156694611a5 Mon Sep 17 00:00:00 2001 From: sidey79 <7968127+sidey79@users.noreply.github.com> Date: Wed, 1 Dec 2021 23:04:17 +0100 Subject: [PATCH] Update mirror.yml get more output --- .github/workflows/mirror.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 5eae2cbb9..19563693e 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -57,7 +57,6 @@ jobs: key: ${{ runner.os }}-fhemsvnmirror3-${{ steps.get-date.outputs.timestamp }} restore-keys: | ${{ runner.os }}-fhemsvnmirror3- - ${{ runner.os }}-fhemsvnmirror2-20211129 - name: init mirror repository if it is not already a mirror timeout-minutes: 1800 @@ -86,8 +85,9 @@ 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 branch -a #git rebase "remotes/svn/trunk" - git svn rebase "remotes/svn/trunk" + git svn rebase echo "::set-output name=SVN_FETCH_STATUS::complete" elif [[ $RET != 124 ]]; then echo "::set-output name=SVN_FETCH_STATUS::error"