提交 4722a8df 编写于 作者: A Alexander Alekhin

Merge pull request #21998 from alalek:gha_fix_git_merge_fixup_21986

......@@ -45,7 +45,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 }}"
......@@ -161,7 +161,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 }}"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册