From affcea8822b92967cb7c213f5f3cefb3171b286e Mon Sep 17 00:00:00 2001 From: Andrey Senyaev Date: Fri, 13 May 2022 15:38:51 +0300 Subject: [PATCH] Added opencv_contrib branch check on Windows --- .github/workflows/PR-3.4-W10.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/PR-3.4-W10.yaml b/.github/workflows/PR-3.4-W10.yaml index ec9614ccd4..2cfed6a32e 100644 --- a/.github/workflows/PR-3.4-W10.yaml +++ b/.github/workflows/PR-3.4-W10.yaml @@ -42,8 +42,8 @@ jobs: - name: Merge opencv_extra with ${{ env.SOURCE_BRANCH_NAME }} branch shell: bash run: | - RET=$(git ls-remote --heads "git@github.com:${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}") || true - if [[ ! -z "$RET" ]]; then + 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 opencv_extra git config user.email "opencv.ci" @@ -154,6 +154,19 @@ jobs: git pull -v "git@github.com:${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}" - name: Fetch opencv_contrib run: cd ${{ github.workspace }} && git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv_contrib.git --depth 1 git@github.com:opencv/opencv_contrib.git + - name: Merge opencv_contrib with ${{ env.SOURCE_BRANCH_NAME }} branch + shell: bash + run: | + 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 /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 }}" + else + echo "No merge since ${{ env.PR_AUTHOR }}/opencv_contrib does not have branch ${{ env.SOURCE_BRANCH_NAME }}" + fi - name: Configure OpenCV Contrib run: | mkdir ${{ github.workspace }}\opencv-contrib-build && cd ${{ github.workspace }}\opencv-contrib-build