diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 1e1c1cbb0..54513e767 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -52,9 +52,9 @@ jobs: uses: actions/cache@v2.1.6 with: path: ./src/fhem-mirror - key: ${{ runner.os }}-fhemsvnmirror-${{ steps.get-date.outputs.timestamp }} + key: ${{ runner.os }}-fhemsvnmirror2-${{ steps.get-date.outputs.timestamp }} restore-keys: | - ${{ runner.os }}-fhemsvnmirror- + ${{ runner.os }}-fhemsvnmirror2- - name: init mirror repository if it is not already a mirror timeout-minutes: 1800 @@ -82,7 +82,6 @@ jobs: 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 if [[ $RET == 0 ]]; then - git config --unset svn-remote.svn.noMetadata; git checkout -f "master" #git rebase "remotes/svn/trunk" git svn rebase "remotes/svn/trunk"