Skip to content

Commit d52c31d

Browse files
committed
fixup! Add custom action and unified Linux build
1 parent 9442f86 commit d52c31d

File tree

3 files changed

+40
-10
lines changed

3 files changed

+40
-10
lines changed

.editorconfig

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# https://editorconfig.org/
2+
3+
root = true
4+
5+
[*]
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
indent_style = space
11+
indent_size = 4
12+
13+
[*.json]
14+
indent_size = 4
15+
16+
[*.{yml,yaml}]
17+
indent_size = 2
18+
19+
[*.{bat,cmd,cmd.*}]
20+
end_of_line = crlf
21+
indent_style = space
22+
indent_size = 2
23+
24+
[*.{ps1,ps1.*}]
25+
end_of_line = crlf
26+
indent_style = space
27+
indent_size = 4
28+
29+
[*.{md,markdown}]
30+
indent_size = 2

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
else
3333
echo "branches=[ '${{ github.base_ref }}' ]" >> "$GITHUB_OUTPUT"
3434
fi
35-
35+
3636
Ubuntu:
3737
runs-on: opencv-ru-lin-riscv
3838
needs:
@@ -41,7 +41,7 @@ jobs:
4141
fail-fast: false
4242
max-parallel: 3
4343
matrix:
44-
version:
44+
version:
4545
- '24.04'
4646
- '22.04'
4747
- '20.04'
@@ -57,7 +57,7 @@ jobs:
5757
- version: '20.04'
5858
image: '20.04:20230413'
5959
limited_api: true
60-
60+
6161
defaults:
6262
run:
6363
shell: bash
@@ -79,12 +79,12 @@ jobs:
7979
CCACHE_DIR: '/opt/.ccache'
8080
OPENCV_DOWNLOAD_PATH: '/opt/binaries_cache'
8181
CMAKE_OPT: >-
82-
-DBUILD_DOCS=ON
83-
-DBUILD_EXAMPLES=ON
84-
-DOPENCV_ENABLE_NONFREE=ON
85-
${{ matrix.jpegxl && '-DWITH_JPEGXL=ON' }}
86-
${{ matrix.avx2 && '-DCPU_BASELINE=AVX2'}}
87-
${{ matrix.plugins && '-DVIDEOIO_PLUGIN_LIST=all -DHIGHGUI_PLUGIN_LIST=all' }}
82+
-DBUILD_DOCS=ON
83+
-DBUILD_EXAMPLES=ON
84+
-DOPENCV_ENABLE_NONFREE=ON
85+
${{ matrix.jpegxl && '-DWITH_JPEGXL=ON' }}
86+
${{ matrix.avx2 && '-DCPU_BASELINE=AVX2'}}
87+
${{ matrix.plugins && '-DVIDEOIO_PLUGIN_LIST=all -DHIGHGUI_PLUGIN_LIST=all' }}
8888
${{ matrix.limited_api && '-DPYTHON3_LIMITED_API=ON' }}
8989
HOME: ${{ contains(matrix.image, '24.04') && '/home/ubuntu' || '/home/ci' }}
9090
OPENCV_FOR_THREADS_NUM: 8

scripts/test-plan.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@
101101
}
102102
}
103103
}
104-
}
104+
}

0 commit comments

Comments
 (0)