From ce859edba81a97f344a15b13c42c3331ab36df75 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 17 May 2022 14:53:04 +0000 Subject: [PATCH] GHA: fix git merge (part 2) --- .github/workflows/PR-3.4-W10.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/PR-3.4-W10.yaml b/.github/workflows/PR-3.4-W10.yaml index b8068cd05f..3bbd6a543b 100644 --- a/.github/workflows/PR-3.4-W10.yaml +++ b/.github/workflows/PR-3.4-W10.yaml @@ -44,7 +44,7 @@ jobs: OPENCV_EXTRA_FORK=$(git ls-remote --heads "git@github.com:/${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}") || true if [[ ! -z "$OPENCV_EXTRA_FORK" ]]; then echo "Merge opencv_extra with ${{ env.SOURCE_BRANCH_NAME }} branch" - cd ${{ github.workspace }}\opencv_extra + cd opencv_extra git config user.email "opencv.ci" git config user.name "opencv.ci" git pull -v "git@github.com:${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}" @@ -159,7 +159,7 @@ jobs: OPENCV_CONTRIB_FORK=$(git ls-remote --heads "git@github.com:${{ env.PR_AUTHOR }}/opencv_contrib" "${{ env.SOURCE_BRANCH_NAME }}") || true if [[ ! -z "$OPENCV_CONTRIB_FORK" ]]; then echo "Merge opencv_contrib with ${{ env.SOURCE_BRANCH_NAME }} branch" - cd ${{ github.workspace }}\opencv_contrib + cd opencv_contrib git config user.email "opencv.ci" git config user.name "opencv.ci" git pull -v "git@github.com:${{ env.PR_AUTHOR }}/opencv_contrib" "${{ env.SOURCE_BRANCH_NAME }}"