Skip to content

Commit c4c983b

Browse files
committed
fixup! Add custom action and unified Linux build
1 parent 212df35 commit c4c983b

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

.github/workflows/OCV-PR-Linux.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,6 @@ jobs:
147147
builddir: 'build'
148148
suite: "linux-${{ matrix.branch }}"
149149
filter: "ubuntu-common"
150-
# enable_python: "true"
151-
# enable_java: "true"
150+
enable_python: "true"
151+
enable_java: "true"
152152
suffix: '${{ matrix.version }}_${{ matrix.branch }}'

run-tests/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ runs:
7676
7777
# Java
7878

79-
- if: ${{ always() && inputs.enable_java }}
79+
- if: ${{ always() && fromJSON(inputs.enable_java) }}
8080
id: java-test
8181
shell: bash
8282
working-directory: ${{ inputs.workdir }}/${{ inputs.builddir }}

scripts/test-plan.json

-3
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@
3737
"opencv_test_dnn_classic",
3838
"opencv_test_features",
3939
"opencv_test_flann",
40-
"opencv_test_gapi",
4140
"opencv_test_highgui",
4241
"opencv_test_imgcodecs",
4342
"opencv_test_imgproc",
44-
"opencv_test_ml",
4543
"opencv_test_objdetect",
4644
"opencv_test_photo",
4745
"opencv_test_stitching",
@@ -51,7 +49,6 @@
5149
"opencv_perf_core",
5250
"opencv_perf_dnn",
5351
"opencv_perf_features",
54-
"opencv_perf_gapi",
5552
"opencv_perf_imgcodecs",
5653
"opencv_perf_imgproc",
5754
"opencv_perf_objdetect",

0 commit comments

Comments
 (0)