fixup! Add custom action and unified Linux build

Author: mshabunin

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

@@ -125,7 +125,6 @@ jobs:
         workdir: '${{ env.HOME }}'
         builddir: 'build'
         generator: 'Ninja'
-        enable_contrib: 'false'
         options: '${{ env.CMAKE_OPT }}'
 
     - name: Configure and build OpenCV with contrib
@@ -134,8 +133,7 @@ jobs:
         workdir: '${{ env.HOME }}'
         builddir: 'build-contrib'
         generator: 'Ninja'
-        enable_contrib: 'true'
-        options: '${{ env.CMAKE_OPT }}'
+        options: '-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules ${{ env.CMAKE_OPT }}'
 
     - name: Run OpenCV tests
       uses: ./run-tests
@@ -149,6 +147,6 @@ jobs:
         builddir: 'build'
         suite: "linux-${{ matrix.branch }}"
         filter: "ubuntu-common"
-        enable_python: "true"
-        enable_java: "true"
+        # enable_python: "true"
+        # enable_java: "true"
         suffix: '${{ matrix.version }}_${{ matrix.branch }}'

configure-and-build/action.yml

@@ -11,9 +11,6 @@ inputs:
     description: "CMake generator, e.g. Ninja"
   options:
     description: "Extra CMake options"
-  enable_contrib:
-    description: "Enable opencv_contrib"
-    default: "false"
 
 runs:
   using: "composite"
@@ -29,7 +26,6 @@ runs:
           -S opencv \
           -B ${{ inputs.builddir }} \
           -G ${{ inputs.generator }} \
-          ${{ fromJSON(inputs.enable_contrib) && '-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules' }} \
           ${{ inputs.options }}
         echo "::endgroup::"