Skip to content

Commit 6d8af5a

Browse files
committed
fix raw test
1 parent 0eeee1e commit 6d8af5a

File tree

1 file changed

+24
-8
lines changed

1 file changed

+24
-8
lines changed

.github/workflows/test-opencvsharp.yml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,14 +278,19 @@ jobs:
278278
- { os: linux, arch: x64, runs-on: ubuntu-24.04 }
279279
- { os: linux, arch: arm64, runs-on: ubuntu-22.04-arm }
280280
- { os: linux, arch: arm64, runs-on: ubuntu-24.04-arm }
281-
- { os: ubuntu.24.04, arch: x64, runs-on: ubuntu-22.04 } # expects fails
282-
- { os: ubuntu.24.04, arch: arm64, runs-on: ubuntu-22.04-arm } # expects fails
281+
- { os: ubuntu.24.04, arch: x64, runs-on: ubuntu-22.04, expect-fails: true }
282+
- { os: ubuntu.24.04, arch: arm64, runs-on: ubuntu-22.04-arm, expect-fails: true }
283283
- { os: ubuntu.24.04, arch: x64, runs-on: ubuntu-24.04 }
284284
- { os: ubuntu.24.04, arch: arm64, runs-on: ubuntu-24.04-arm }
285-
- { os: macos.13, arch: x64, runs-on: macos.13 }
286-
- { os: macos.14, arch: arm64, runs-on: macos.14 }
287-
- { os: macos.14, arch: arm64, runs-on: macos.15 }
288-
- { os: macos.15, arch: arm64, runs-on: macos.15 }
285+
- { os: osx, arch: x64, runs-on: macos-13 }
286+
- { os: osx, arch: arm64, runs-on: macos-14 }
287+
- { os: osx, arch: arm64, runs-on: macos-15 }
288+
- { os: osx.15, arch: arm64, runs-on: macos-15 }
289+
- { os: win, arch: x64, runs-on: windows-2022 }
290+
- { os: win, arch: x64, runs-on: windows-2025 }
291+
- { os: win, arch: arm64, runs-on: windows-11-arm }
292+
- { os: win.11, arch: x64, runs-on: windows-2022 }
293+
- { os: win.11, arch: x64, runs-on: windows-2025 }
289294
steps:
290295
- name: Download Artifacts
291296
uses: actions/download-artifact@v4
@@ -294,9 +299,20 @@ jobs:
294299
path: test
295300

296301
- name: Run Tests
302+
continue-on-error: ${{ matrix.expect-fails || false }}
297303
run: |
298304
chmod +x test/test.exe
299-
cd test && ls && ldd ./test.exe && ./test.exe
305+
cd test && ls
306+
307+
if [[ ${{ matrix.os }} =~ ^osx ]]; then
308+
otool -L ./test.exe || ${{ matrix.expect-fails }}
309+
./test.exe || ${{ matrix.expect-fails }}
310+
elif [[ ${{ matrix.os }} =~ win ]]; then
311+
./test.exe
312+
else
313+
ldd ./test.exe
314+
./test.exe
315+
fi
300316
301317
docker-test:
302318
name: Docker Test
@@ -305,7 +321,7 @@ jobs:
305321
defaults:
306322
run:
307323
shell: bash
308-
needs: build
324+
needs: raw-test
309325
strategy:
310326
fail-fast: false
311327
matrix:

0 commit comments

Comments
 (0)