Skip to content

Commit 230bdff

Browse files
authored
Merge pull request #698 from asenyaev/asen/5.x_pipelines
Run pipelines on 5.x branch
2 parents 7b10157 + 5aad8e1 commit 230bdff

6 files changed

+11
-1
lines changed

.github/workflows/build_wheels_linux.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches:
66
- master
77
- 3.4
8+
- 4.x
9+
- 5.x
810
paths-ignore:
911
- '.github/workflows/build_wheels_linux_arm.yml'
1012
- '.github/workflows/build_wheels_windows*'

.github/workflows/build_wheels_linux_arm.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches:
66
- master
77
- 3.4
8+
- 4.x
9+
- 5.x
810
paths-ignore:
911
- '.github/workflows/build_wheels_linux.yml'
1012
- '.github/workflows/build_wheels_windows*'

.github/workflows/build_wheels_macos.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches:
66
- master
77
- 3.4
8+
- 4.x
9+
- 5.x
810
paths-ignore:
911
- '.github/workflows/build_wheels_linux*'
1012
- '.github/workflows/build_wheels_windows*'

.github/workflows/build_wheels_macos_m1.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches:
66
- master
77
- 3.4
8+
- 4.x
9+
- 5.x
810
paths-ignore:
911
- '.github/workflows/build_wheels_linux*'
1012
- '.github/workflows/build_wheels_windows*'

.github/workflows/build_wheels_windows.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches:
66
- master
77
- 3.4
8+
- 4.x
9+
- 5.x
810
paths-ignore:
911
- '.github/workflows/build_wheels_linux*'
1012
- '.github/workflows/build_wheels_macos*'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def main():
109109
r"python/cv2/.*config.*.py"
110110
],
111111
"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
112-
("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
112+
("etc" if os.name == "nt" else "share/opencv5") + r"/haarcascades/.*\.xml"
113113
],
114114
"cv2.gapi": [
115115
"python/cv2" + r"/gapi/.*\.py"

0 commit comments

Comments
 (0)