From 19dd46a75d995b2d37fb249a6236c3e537e0e650 Mon Sep 17 00:00:00 2001 From: Andrey Senyaev Date: Wed, 31 Aug 2022 15:47:49 +0300 Subject: [PATCH 1/2] Turn on gapi tests on ARM64 --- .../workflows/OCV-Contrib-PR-4.x-ARM64.yaml | 8 ++++++++ .../OCV-Contrib-PR-4.x-macOS-ARM64.yaml | 20 +++++++++---------- .../workflows/OCV-Contrib-PR-5.x-ARM64.yaml | 8 ++++++++ .../OCV-Contrib-PR-5.x-macOS-ARM64.yaml | 20 +++++++++---------- .github/workflows/OCV-PR-4.x-ARM64.yaml | 8 ++++++++ .github/workflows/OCV-PR-4.x-macOS-ARM64.yaml | 20 +++++++++---------- .github/workflows/OCV-PR-5.x-ARM64.yaml | 8 ++++++++ .github/workflows/OCV-PR-5.x-macOS-ARM64.yaml | 20 +++++++++---------- 8 files changed, 72 insertions(+), 40 deletions(-) diff --git a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml index 6338e9f6..9ec064f3 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml @@ -175,6 +175,10 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_fuzzy --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} + - name: Accuracy:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} + run: cd $HOME/build && xvfb-run -a bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} - name: Accuracy:hdf timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} @@ -335,6 +339,10 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }} + - name: Performance:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} + run: cd $HOME/build && xvfb-run -a bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }} - name: Performance:imgcodecs timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} diff --git a/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml index 1995c9bf..2d024b17 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml @@ -179,11 +179,11 @@ jobs: if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} run: ./bin/opencv_test_fuzzy --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS working-directory: ${{ github.workspace }}/build - # - name: Accuracy:gapi - # timeout-minutes: 60 - # if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} - # run: ./bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS - # working-directory: ${{ github.workspace }}/build + - name: Accuracy:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} + run: ./bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS + working-directory: ${{ github.workspace }}/build - name: Accuracy:hdf timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} @@ -384,11 +384,11 @@ jobs: if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} run: ./bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS working-directory: ${{ github.workspace }}/build - # - name: Performance:gapi - # timeout-minutes: 60 - # if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} - # run: ./bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS - # working-directory: ${{ github.workspace }}/build + - name: Performance:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} + run: ./bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS + working-directory: ${{ github.workspace }}/build - name: Performance:imgcodecs timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} diff --git a/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml index 5c5d3e54..f2b9fe1c 100644 --- a/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml @@ -179,6 +179,10 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_fuzzy --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} + - name: Accuracy:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} + run: cd $HOME/build && xvfb-run -a bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} - name: Accuracy:hdf timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} @@ -347,6 +351,10 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }} + - name: Performance:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} + run: cd $HOME/build && xvfb-run -a bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }} - name: Performance:imgcodecs timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} diff --git a/.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml index a2519800..b82957d0 100644 --- a/.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml @@ -183,11 +183,11 @@ jobs: if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} run: ./bin/opencv_test_fuzzy --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS working-directory: ${{ github.workspace }}/build - # - name: Accuracy:gapi - # timeout-minutes: 60 - # if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} - # run: ./bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS - # working-directory: ${{ github.workspace }}/build + - name: Accuracy:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} + run: ./bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS + working-directory: ${{ github.workspace }}/build - name: Accuracy:hdf timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} @@ -398,11 +398,11 @@ jobs: if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} run: ./bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS working-directory: ${{ github.workspace }}/build - # - name: Performance:gapi - # timeout-minutes: 60 - # if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} - # run: ./bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS - # working-directory: ${{ github.workspace }}/build + - name: Performance:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} + run: ./bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS + working-directory: ${{ github.workspace }}/build - name: Performance:imgcodecs timeout-minutes: 60 if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }} diff --git a/.github/workflows/OCV-PR-4.x-ARM64.yaml b/.github/workflows/OCV-PR-4.x-ARM64.yaml index 4e634d6c..5c87acff 100644 --- a/.github/workflows/OCV-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-4.x-ARM64.yaml @@ -130,6 +130,10 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_flann --test_threads=${{ env.PARALLEL_JOBS }} + - name: Accuracy:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: cd $HOME/build && xvfb-run -a bin/opencv_test_gapi --test_threads=${{ env.PARALLEL_JOBS }} - name: Accuracy:highgui timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} @@ -182,6 +186,10 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }} + - name: Performance:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: cd $HOME/build && xvfb-run -a bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }} - name: Performance:imgcodecs timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} diff --git a/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml b/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml index 9f6b678c..83b988b7 100644 --- a/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml @@ -127,11 +127,11 @@ jobs: if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: ./bin/opencv_test_flann --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS working-directory: ${{ github.workspace }}/build - # - name: Accuracy:gapi - # timeout-minutes: 60 - # if: ${{ always() && steps.build-opencv.outcome == 'success' }} - # run: ./bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS - # working-directory: ${{ github.workspace }}/build + - name: Accuracy:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: ./bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS + working-directory: ${{ github.workspace }}/build - name: Accuracy:highgui timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} @@ -197,11 +197,11 @@ jobs: if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: ./bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS working-directory: ${{ github.workspace }}/build - # - name: Performance:gapi - # timeout-minutes: 60 - # if: ${{ always() && steps.build-opencv.outcome == 'success' }} - # run: ./bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS - # working-directory: ${{ github.workspace }}/build + - name: Performance:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: ./bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS + working-directory: ${{ github.workspace }}/build - name: Performance:imgcodecs timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} diff --git a/.github/workflows/OCV-PR-5.x-ARM64.yaml b/.github/workflows/OCV-PR-5.x-ARM64.yaml index df3a526c..822757d2 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64.yaml @@ -134,6 +134,10 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_flann --test_threads=${{ env.PARALLEL_JOBS }} + - name: Accuracy:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: cd $HOME/build && xvfb-run -a bin/opencv_test_gapi --test_threads=${{ env.PARALLEL_JOBS }} - name: Accuracy:highgui timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} @@ -194,6 +198,10 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }} + - name: Performance:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: cd $HOME/build && xvfb-run -a bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }} - name: Performance:imgcodecs timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} diff --git a/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml b/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml index d5ce4971..75a37b89 100644 --- a/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml @@ -132,11 +132,11 @@ jobs: if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: ./bin/opencv_test_flann --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS working-directory: ${{ github.workspace }}/build - # - name: Accuracy:gapi - # timeout-minutes: 60 - # if: ${{ always() && steps.build-opencv.outcome == 'success' }} - # run: ./bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS - # working-directory: ${{ github.workspace }}/build + - name: Accuracy:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: ./bin/opencv_test_gapi --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS + working-directory: ${{ github.workspace }}/build - name: Accuracy:highgui timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} @@ -212,11 +212,11 @@ jobs: if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: ./bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS working-directory: ${{ github.workspace }}/build - # - name: Performance:gapi - # timeout-minutes: 60 - # if: ${{ always() && steps.build-opencv.outcome == 'success' }} - # run: ./bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS - # working-directory: ${{ github.workspace }}/build + - name: Performance:gapi + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: ./bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS + working-directory: ${{ github.workspace }}/build - name: Performance:imgcodecs timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} From f12ff9e52c537280c47622e4605617938caa0db5 Mon Sep 17 00:00:00 2001 From: Andrey Senyaev Date: Tue, 20 Sep 2022 12:36:26 +0300 Subject: [PATCH 2/2] Try the latest changes for gapi tests --- .../workflows/OCV-Contrib-PR-4.x-ARM64.yaml | 21 ++++++++++------- .../OCV-Contrib-PR-4.x-macOS-ARM64.yaml | 23 +++++++++++-------- .github/workflows/OCV-PR-4.x-ARM64.yaml | 13 +++++++---- .github/workflows/OCV-PR-4.x-macOS-ARM64.yaml | 11 ++++++--- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml index 9ec064f3..2a801237 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml @@ -69,18 +69,23 @@ jobs: - name: Clone opencv timeout-minutes: 60 run: git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE_DOCKER }}/opencv.git https://github.com/opencv/opencv.git $HOME/opencv + # - name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch + # timeout-minutes: 60 + # if: ${{ github.event.repository.name != 'ci-gha-workflow' }} + # run: | + # OPENCV_FORK=$(git ls-remote --heads "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}") || true + # if [[ ! -z "$OPENCV_FORK" ]]; then + # echo "Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch" + # cd $HOME/opencv + # git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}" + # else + # echo "No merge since ${{ env.PR_AUTHOR }}/opencv does not have branch ${{ env.SOURCE_BRANCH_NAME }}" + # fi - name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch timeout-minutes: 60 - if: ${{ github.event.repository.name != 'ci-gha-workflow' }} run: | - OPENCV_FORK=$(git ls-remote --heads "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}") || true - if [[ ! -z "$OPENCV_FORK" ]]; then - echo "Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch" cd $HOME/opencv - git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}" - else - echo "No merge since ${{ env.PR_AUTHOR }}/opencv does not have branch ${{ env.SOURCE_BRANCH_NAME }}" - fi + git pull -v "https://github.com/anna-khakimova/opencv" "ak/fix_resize4lpi_tests" - name: Clone opencv_extra timeout-minutes: 60 run: git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE_DOCKER }}/opencv_extra.git https://github.com/opencv/opencv_extra.git $HOME/opencv_extra diff --git a/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml index 2d024b17..1c346617 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml @@ -58,17 +58,22 @@ jobs: timeout-minutes: 60 run: git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference $GIT_CACHE/opencv.git https://github.com/opencv/opencv.git working-directory: ${{ github.workspace }} - - name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch + # - name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch + # timeout-minutes: 60 + # if: ${{ github.event.repository.name != 'ci-gha-workflow' }} + # run: | + # OPENCV_FORK=$(git ls-remote --heads "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}") || true + # if [[ ! -z "$OPENCV_FORK" ]]; then + # echo "Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch" + # git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}" + # else + # echo "No merge since ${{ env.PR_AUTHOR }}/opencv does not have branch ${{ env.SOURCE_BRANCH_NAME }}" + # fi + # working-directory: ${{ github.workspace }}/opencv + - name: Merge opencv with test branch timeout-minutes: 60 - if: ${{ github.event.repository.name != 'ci-gha-workflow' }} run: | - OPENCV_FORK=$(git ls-remote --heads "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}") || true - if [[ ! -z "$OPENCV_FORK" ]]; then - echo "Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch" - git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}" - else - echo "No merge since ${{ env.PR_AUTHOR }}/opencv does not have branch ${{ env.SOURCE_BRANCH_NAME }}" - fi + git pull -v "https://github.com/anna-khakimova/opencv" "ak/fix_resize4lpi_tests" working-directory: ${{ github.workspace }}/opencv - name: Clone opencv_extra timeout-minutes: 60 diff --git a/.github/workflows/OCV-PR-4.x-ARM64.yaml b/.github/workflows/OCV-PR-4.x-ARM64.yaml index 5c87acff..79a351c0 100644 --- a/.github/workflows/OCV-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-4.x-ARM64.yaml @@ -59,12 +59,17 @@ jobs: - name: Fetch opencv timeout-minutes: 60 run: git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE_DOCKER }}/opencv.git https://github.com/opencv/opencv.git ${{ env.OPENCV_DOCKER_WORKDIR }} - - name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch + # - name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch + # timeout-minutes: 60 + # if: ${{ github.event.repository.name != 'ci-gha-workflow' }} + # run: | + # cd ${{ env.OPENCV_DOCKER_WORKDIR }} + # git pull -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}" + - name: Merge opencv with test branch timeout-minutes: 60 - if: ${{ github.event.repository.name != 'ci-gha-workflow' }} run: | - cd ${{ env.OPENCV_DOCKER_WORKDIR }} - git pull -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}" + cd ${{ env.OPENCV_DOCKER_WORKDIR }} + git pull -v "https://github.com/anna-khakimova/opencv" "ak/fix_resize4lpi_tests" - name: Clone opencv_extra timeout-minutes: 60 run: git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE_DOCKER }}/opencv_extra.git https://github.com/opencv/opencv_extra.git $HOME/opencv_extra diff --git a/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml b/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml index 83b988b7..1695d9e5 100644 --- a/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml @@ -285,10 +285,15 @@ jobs: timeout-minutes: 60 run: git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference $GIT_CACHE/opencv.git https://github.com/opencv/opencv.git working-directory: ${{ github.workspace }} - - name: Merge opencv with a test branch + # - name: Merge opencv with a test branch + # timeout-minutes: 60 + # if: ${{ github.event.repository.name != 'ci-gha-workflow' }} + # run: git pull -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}" + # working-directory: ${{ github.workspace }}/opencv + - name: Merge opencv with test branch timeout-minutes: 60 - if: ${{ github.event.repository.name != 'ci-gha-workflow' }} - run: git pull -v "https://github.com/${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}" + run: | + git pull -v "https://github.com/anna-khakimova/opencv" "ak/fix_resize4lpi_tests" working-directory: ${{ github.workspace }}/opencv - name: Clone opencv_contrib timeout-minutes: 60