|
|
|
@ -30,25 +30,25 @@ jobs: |
|
|
|
|
- name: Clean |
|
|
|
|
run: cd ${{ github.workspace }} && rm -rf * |
|
|
|
|
- name: Fetch opencv |
|
|
|
|
run: cd ${{ github.workspace }} && git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv.git https://github.com/opencv/opencv.git |
|
|
|
|
run: cd ${{ github.workspace }} && git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv.git git@github.com:opencv/opencv.git |
|
|
|
|
- name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch |
|
|
|
|
run: | |
|
|
|
|
cd ${{ github.workspace }}\opencv |
|
|
|
|
git config user.email "opencv.ci" |
|
|
|
|
git config user.name "opencv.ci" |
|
|
|
|
git pull -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}" |
|
|
|
|
git pull -v "git@github.com:${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}" |
|
|
|
|
- name: Fetch opencv_extra |
|
|
|
|
run: cd ${{ github.workspace }} && git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv_extra.git https://github.com/opencv/opencv_extra.git |
|
|
|
|
run: cd ${{ github.workspace }} && git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv_extra.git git@github.com:opencv/opencv_extra.git |
|
|
|
|
- name: Merge opencv_extra with ${{ env.SOURCE_BRANCH_NAME }} branch |
|
|
|
|
shell: bash |
|
|
|
|
run: | |
|
|
|
|
RET=$(git ls-remote --heads "https://github.com/${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}") || true |
|
|
|
|
RET=$(git ls-remote --heads "git@github.com:${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}") || true |
|
|
|
|
if [[ ! -z "$RET" ]]; then |
|
|
|
|
echo "Merge opencv_extra with ${{ env.SOURCE_BRANCH_NAME }} branch" |
|
|
|
|
cd opencv_extra |
|
|
|
|
git config user.email "opencv.ci" |
|
|
|
|
git config user.name "opencv.ci" |
|
|
|
|
git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}" |
|
|
|
|
git pull -v "git@github.com:${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}" |
|
|
|
|
else |
|
|
|
|
echo "No merge since ${{ env.PR_AUTHOR }}/opencv_extra does not have branch ${{ env.SOURCE_BRANCH_NAME }}" |
|
|
|
|
fi |
|
|
|
@ -145,15 +145,15 @@ jobs: |
|
|
|
|
- name: Clean |
|
|
|
|
run: cd ${{ github.workspace }} && rm -rf * |
|
|
|
|
- name: Fetch opencv |
|
|
|
|
run: cd ${{ github.workspace }} && git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv.git https://github.com/opencv/opencv.git |
|
|
|
|
run: cd ${{ github.workspace }} && git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv.git git@github.com:opencv/opencv.git |
|
|
|
|
- name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch |
|
|
|
|
run: | |
|
|
|
|
cd ${{ github.workspace }}\opencv |
|
|
|
|
git config user.email "opencv.ci" |
|
|
|
|
git config user.name "opencv.ci" |
|
|
|
|
git pull -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}" |
|
|
|
|
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 https://github.com/opencv/opencv_contrib.git |
|
|
|
|
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: Configure OpenCV Contrib |
|
|
|
|
run: | |
|
|
|
|
mkdir ${{ github.workspace }}\opencv-contrib-build && cd ${{ github.workspace }}\opencv-contrib-build |
|
|
|
|