Skip to content

Commit 3bcb652

Browse files
committed
try again
1 parent e69134f commit 3bcb652

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

.github/workflows/opencv.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,20 @@ env:
3535
3636
jobs:
3737
build:
38-
name: Build OpenCV
39-
4038
runs-on: ${{
41-
contains(matrix.rid, 'ubuntu.22.04') && 'ubuntu-22.04' ||
42-
contains(matrix.rid, 'ubuntu.24.04') && 'ubuntu-24.04' ||
43-
contains(matrix.rid, 'win-x64') && 'windows-2022' ||
44-
contains(matrix.rid, 'osx-arm64') && 'macos-15'
39+
(matrix.os == 'ubuntu.22.04') && 'ubuntu-22.04' ||
40+
(matrix.os == 'ubuntu.24.04') && 'ubuntu-24.04' ||
41+
(matrix.os == 'win' && matrix.arch == 'x64') && 'windows-2022' ||
42+
(matrix.os == 'osx' && matrix.arch == 'arm64') && 'macos-15'
4543
}}
4644

4745
strategy:
4846
matrix:
49-
rid: [ubuntu.22.04-x64, ubuntu.24.04-x64, win-x64, osx-arm64]
47+
include:
48+
- { os: ubuntu.22.04, arch: x64 }
49+
- { os: ubuntu.24.04, arch: x64 }
50+
- { os: win, arch: x64 }
51+
- { os: osx, arch: arm64 }
5052

5153
steps:
5254
- name: Install Dependencies
@@ -78,7 +80,7 @@ jobs:
7880
- name: Build OpenCV
7981
run: |
8082
cd opencv/build
81-
if [[ ${{ matrix.rid }} == win-* ]]; then
83+
if [[ ${{ matrix.os }} == win ]]; then
8284
make -j %NUMBER_OF_PROCESSORS%
8385
else
8486
make -j$(nproc)

0 commit comments

Comments
 (0)