Skip to content

Commit a54ff12

Browse files
twistedfalltwistedfall
authored
Merge branch 'master' into unit/feature2d-bfmatcher
2 parents f88f3cb + daca578 commit a54ff12

File tree

258 files changed

+72869
-19190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+72869
-19190
lines changed

‎.github/dependabot.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
version: 2
22
updates:
3-
- package-ecosystem: cargo
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
open-pull-requests-limit: 10
3+
- package-ecosystem: "cargo"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
open-pull-requests-limit: 10
8+
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
schedule:
12+
interval: "daily"
13+
open-pull-requests-limit: 10

‎.github/workflows/opencv-rust.yml

Lines changed: 71 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ on:
33
push:
44
branches:
55
- "*"
6-
tags_ignore:
7-
- "*"
86
pull_request:
97
branches:
108
- "*"
@@ -15,39 +13,45 @@ jobs:
1513
matrix:
1614
os-image:
1715
- ubuntu-22.04
18-
- macos-12
19-
version:
20-
- opencv: 3.4.19
21-
- opencv: 4.8.0
22-
exclude:
23-
- os-image: macos-12
24-
version:
25-
opencv: 3.4.20
16+
- macos-13
17+
opencv-version:
18+
- 3.4.20
19+
- 4.9.0
20+
linkage:
21+
- dynamic
2622
include:
2723
- os-image: ubuntu-22.04
28-
version:
29-
opencv: 4.8.0-static
24+
opencv-version: 4.9.0
25+
linkage: static
3026
runs-on: ${{ matrix.os-image }}
3127
env:
3228
Atlas_ROOT_DIR: /usr/include/ # for cmake to find lapacke.h
33-
OPENCV_VERSION: ${{ matrix.version.opencv }}
29+
OPENCV_VERSION: ${{ matrix.opencv-version }}
30+
OPENCV_LINKAGE: ${{ matrix.linkage }}
31+
SCCACHE_GHA_ENABLED: "true"
32+
RUSTC_WRAPPER: "sccache"
33+
CMAKE_C_COMPILER_LAUNCHER: "sccache"
34+
CMAKE_CXX_COMPILER_LAUNCHER: "sccache"
3435
steps:
35-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
37+
- uses: dtolnay/rust-toolchain@stable
38+
- uses: mozilla-actions/[email protected]
39+
- uses: actions/cache@v4
40+
with:
41+
path: ~/dist
42+
key: dist-${{ matrix.opencv-version }}
3643

37-
- name: Cache dependencies
38-
uses: actions/cache@v3
44+
- uses: actions/cache@v4
3945
with:
4046
path: ~/build
41-
key: src-${{ matrix.version.opencv }}-${{ matrix.os-image }}
47+
key: build-${{ matrix.opencv-version }}-${{ matrix.linkage }}-${{ matrix.os-image }}
4248

4349
- name: Install dependencies
4450
env:
4551
OS_FAMILY: ${{ runner.os }}
4652
run: ci/install.sh
4753
shell: bash
4854

49-
- uses: dtolnay/rust-toolchain@stable
50-
5155
- name: Test project
5256
env:
5357
OS_FAMILY: ${{ runner.os }}
@@ -61,28 +65,29 @@ jobs:
6165
os-image:
6266
- ubuntu-22.04
6367
- windows-2022
64-
version:
65-
- vcpkg: b7dba7f9aad09a56900f21cd78cfda1258e54e38
68+
- macos-14
69+
vcpkg-version:
70+
- 2024.03.25
6671
runs-on: ${{ matrix.os-image }}
6772
env:
68-
VCPKG_VERSION: ${{ matrix.version.vcpkg }}
73+
VCPKG_VERSION: ${{ matrix.vcpkg-version }}
74+
SCCACHE_GHA_ENABLED: "true"
75+
RUSTC_WRAPPER: "sccache"
6976
steps:
70-
- uses: actions/checkout@v3
71-
72-
- name: Cache dependencies
73-
uses: actions/cache@v3
77+
- uses: actions/checkout@v4
78+
- uses: dtolnay/rust-toolchain@stable
79+
- uses: mozilla-actions/[email protected]
80+
- uses: actions/cache@v4
7481
with:
7582
path: ~/build
76-
key: vcpkg-${{ matrix.version.vcpkg }}-${{ matrix.os-image }}
83+
key: vcpkg-${{ matrix.vcpkg-version }}-${{ matrix.os-image }}
7784

7885
- name: Install dependencies
7986
env:
8087
OS_FAMILY: ${{ runner.os }}
8188
run: ci/install.sh
8289
shell: bash
8390

84-
- uses: dtolnay/rust-toolchain@stable
85-
8691
- name: Test project
8792
env:
8893
OS_FAMILY: ${{ runner.os }}
@@ -94,35 +99,37 @@ jobs:
9499
fail-fast: false
95100
matrix:
96101
os-image:
97-
- macos-12
98102
- windows-2022
99103
version:
100-
- branch: 3.4
101-
opencv: 3.4.16
102-
brew: "@3"
103-
- branch: 4
104-
opencv: 4.7.0
105-
brew: "@4"
104+
- opencv: 3.4.16
105+
- opencv: 4.9.0
106106
include:
107107
- os-image: ubuntu-22.04
108108
version:
109109
opencv: 4.5.4
110-
brew: excluded
110+
- os-image: ubuntu-20.04
111+
version:
112+
opencv: 4.2.0
113+
- os-image: macos-14
114+
version:
115+
brew: "@4"
111116
runs-on: ${{ matrix.os-image }}
112117
env:
113118
OPENCV_VERSION: ${{ matrix.version.opencv }}
114119
BREW_OPENCV_VERSION: ${{ matrix.version.brew }}
120+
SCCACHE_GHA_ENABLED: "true"
121+
RUSTC_WRAPPER: "sccache"
115122
steps:
116-
- uses: actions/checkout@v3
123+
- uses: actions/checkout@v4
124+
- uses: dtolnay/rust-toolchain@stable
125+
- uses: mozilla-actions/[email protected]
117126

118127
- name: Install dependencies
119128
env:
120129
OS_FAMILY: ${{ runner.os }}
121130
run: ci/install.sh
122131
shell: bash
123132

124-
- uses: dtolnay/rust-toolchain@stable
125-
126133
- name: Test project
127134
env:
128135
OS_FAMILY: ${{ runner.os }}
@@ -132,26 +139,34 @@ jobs:
132139
docs-rs:
133140
runs-on: ubuntu-22.04
134141
steps:
135-
- uses: actions/checkout@v3
136-
142+
- uses: actions/checkout@v4
137143
- uses: dtolnay/rust-toolchain@stable
138144

139145
- name: Run a documentation generation test
140146
run: ci/docs-rs.sh
141147
shell: bash
142148

143149
msrv:
144-
runs-on: ubuntu-22.04
150+
runs-on: ubuntu-20.04
145151
env:
146-
OPENCV_VERSION: 4.5.4
152+
OPENCV_VERSION: 4.9.0
153+
SCCACHE_GHA_ENABLED: "true"
154+
RUSTC_WRAPPER: "sccache"
155+
CMAKE_C_COMPILER_LAUNCHER: "sccache"
156+
CMAKE_CXX_COMPILER_LAUNCHER: "sccache"
147157
steps:
148-
- uses: actions/checkout@v3
158+
- uses: actions/checkout@v4
159+
- uses: mozilla-actions/[email protected]
149160

150-
- name: Install dependencies
151-
env:
152-
OS_FAMILY: ${{ runner.os }}
153-
run: ci/install.sh
154-
shell: bash
161+
- uses: actions/cache@v4
162+
with:
163+
path: ~/dist
164+
key: dist-${{ env.OPENCV_VERSION }}
165+
166+
- uses: actions/cache@v4
167+
with:
168+
path: ~/build
169+
key: build-${{ env.OPENCV_VERSION }}-ubuntu-20.04
155170

156171
- name: Get MSRV package metadata
157172
id: metadata
@@ -161,6 +176,12 @@ jobs:
161176
with:
162177
toolchain: ${{ steps.metadata.outputs.msrv }}
163178

179+
- name: Install dependencies
180+
env:
181+
OS_FAMILY: ${{ runner.os }}
182+
run: ci/install.sh
183+
shell: bash
184+
164185
- name: Check project
165186
env:
166187
OS_FAMILY: ${{ runner.os }}

0 commit comments

Comments
 (0)