fixed the prev commit

Fixstars-momoko · Jul 17, 2024 · 5903eb9 · 5903eb9
1 parent 659db9c
commit 5903eb9
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/.github/workflows/develop-Windows.yml b/.github/workflows/develop-Windows.yml
@@ -159,16 +159,25 @@ jobs:
           cmake --build . --config Release 
           cd Release && ls && ./ionkit_test
 
-      - name: Test opencv
-        if: ${{ (matrix.with_openCV == '-InstallOpenCV') }}
+      - name: Test opencv (general)
+        if: ${{ (matrix.os == 'windows-2019') && (matrix.with_openCV == '-InstallOpenCV')}}
+        run: |
+          $PATH =  [Environment]::GetEnvironmentVariable("PATH", "User")
+          $SENSING_DEV_ROOT= [Environment]::GetEnvironmentVariable("SENSING_DEV_ROOT", "User")
+          $env:SENSING_DEV_ROOT=${SENSING_DEV_ROOT} 
+          $env:PATH="$env:PATH;$PATH"
+          cd ${{ github.workspace }}/download/installer/testcases/cpp/opencv_test  && cmake ./
+          cmake --build . --config Release 
+          cd Release && ./opencv_test
+
+      - name: Test opencv (with the latest MSVC with OpenCV)
+        if: ${{ (matrix.os == 'windows-latest') && (matrix.with_openCV == '-InstallOpenCV')}}
         run: |
           $PATH =  [Environment]::GetEnvironmentVariable("PATH", "User")
           $SENSING_DEV_ROOT= [Environment]::GetEnvironmentVariable("SENSING_DEV_ROOT", "User")
           $env:SENSING_DEV_ROOT=${SENSING_DEV_ROOT} 
           $env:PATH="$env:PATH;$PATH"
-          if (${{ matrix.os }}  == 'windows-latest' ){
-            $OpenCVBin = Join-Path -Path $SENSING_DEV_ROOT -ChildPath ${{ needs.set_env.outputs.latest_opencv_bin }}
-          } 
+          $OpenCVBin = Join-Path -Path $SENSING_DEV_ROOT -ChildPath ${{ needs.set_env.outputs.latest_opencv_bin }} 
           $env:PATH="$env:PATH;$OpenCVBin"
           cd ${{ github.workspace }}/download/installer/testcases/cpp/opencv_test  && cmake ./
           cmake --build . --config Release