Skip to content

Commit fed1fa8

Browse files
committed
fixup! Add custom action and unified Linux build
1 parent b07e14e commit fed1fa8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

configure-and-build/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ runs:
2929
-S opencv \
3030
-B ${{ inputs.builddir }} \
3131
-G ${{ inputs.generator }} \
32-
${{ inputs.enable_contrib && '-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules' }} \
32+
${{ fromJSON(inputs.enable_contrib) && '-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules' }} \
3333
${{ inputs.options }}
3434
echo "::endgroup::"
3535

run-tests/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ runs:
5656

5757
# Python
5858

59-
- if: ${{ always() && inputs.enable_python }}
59+
- if: ${{ always() && fromJSON(inputs.enable_python) }}
6060
shell: bash
6161
working-directory: ${{ inputs.workdir }}/${{ inputs.builddir }}
6262
run: |
6363
echo "::group::Python test"
6464
python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
6565
echo "::endgroup::"
6666
67-
- if: ${{ always() && inputs.enable_python }}
67+
- if: ${{ always() && fromJSON(inputs.enable_python) }}
6868
shell: bash
6969
working-directory: ${{ inputs.workdir }}/${{ inputs.builddir }}
7070
run: |

0 commit comments

Comments
 (0)