mirror of
https://github.com/opencv/opencv.git
synced 2025-08-06 06:26:29 +08:00
opencv_extra fork usage in Github Actions
This commit is contained in:
parent
64da959619
commit
8c42dbf71c
14
.github/workflows/PR-3.4-U20.yaml
vendored
14
.github/workflows/PR-3.4-U20.yaml
vendored
@ -46,7 +46,19 @@ jobs:
|
|||||||
git config user.name "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 "https://github.com/${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}"
|
||||||
- name: Clone opencv_extra
|
- name: Clone opencv_extra
|
||||||
run: git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --depth 1 https://github.com/opencv/opencv_extra.git /opencv_extra
|
run: git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} https://github.com/opencv/opencv_extra.git /opencv_extra
|
||||||
|
- name: Merge opencv_extra with ${{ env.SOURCE_BRANCH_NAME }} branch
|
||||||
|
run: |
|
||||||
|
RET=$(git ls-remote --heads "https://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 }}"
|
||||||
|
else
|
||||||
|
echo "No merge since ${{ env.PR_AUTHOR }}/opencv_extra does not have branch ${{ env.SOURCE_BRANCH_NAME }}"
|
||||||
|
fi
|
||||||
- name: Configure OpenCV
|
- name: Configure OpenCV
|
||||||
run: |
|
run: |
|
||||||
cd /opencv-build
|
cd /opencv-build
|
||||||
|
Loading…
Reference in New Issue
Block a user