From b7749ea0e4724d0ded3fba8113a5b581dd28b33d Mon Sep 17 00:00:00 2001 From: Momoko Kono Date: Wed, 24 Jul 2024 13:41:25 -0700 Subject: [PATCH] updated condition --- .github/workflows/develop-Windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop-Windows.yml b/.github/workflows/develop-Windows.yml index dd772306..f6b2235b 100644 --- a/.github/workflows/develop-Windows.yml +++ b/.github/workflows/develop-Windows.yml @@ -110,13 +110,13 @@ jobs: Move-Item -Path ${{ github.workspace }}/download/installer/tools/installer.ps1 -Destination ${{ github.workspace }}/test - name: Install with the script from Artifacts (general) - if: ${{ !((matrix.os == 'windows-latest') && (matrix.with_openCV == '-InstallOpenCV') && (matrix.install_option == '-version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}'))}} + if: ${{ matrix.os != 'windows-latest' || matrix.with_openCV != '-InstallOpenCV' || matrix.install_option != format('-version {0}', needs.set_env.outputs.LATEST_RELEASED_SDK) }} run: | cd ${{ github.workspace }}/test powershell.exe -ExecutionPolicy Bypass -File .\installer.ps1 ${{ matrix.install_option }} ${{ matrix.with_openCV }} -verbose - name: Install with the script from Artifacts (with the latest MSVC with Sensing-Dev v24.05 or earlier) - if: ${{(matrix.os == 'windows-latest') && (matrix.with_openCV == '-InstallOpenCV') && (matrix.install_option == '-version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}')}} + if: ${{ matrix.os == 'windows-latest' && matrix.with_openCV == '-InstallOpenCV' && matrix.install_option == format('-version {0}', needs.set_env.outputs.LATEST_RELEASED_SDK) }} run: | cd ${{ github.workspace }}/test powershell.exe -ExecutionPolicy Bypass -File .\installer.ps1 ${{ matrix.install_option }} -verbose @@ -168,7 +168,7 @@ jobs: cd Release && ls && ./ionkit_test - name: Test opencv (general) - if: ${{ !((matrix.os == 'windows-latest') && (matrix.install_option == '-version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}')) && (matrix.with_openCV == '-InstallOpenCV')}} + if: ${{ matrix.with_openCV == '-InstallOpenCV' && (matrix.os != 'windows-latest' || matrix.install_option != format('-version {0}', needs.set_env.outputs.LATEST_RELEASED_SDK)) }} run: | $PATH = [Environment]::GetEnvironmentVariable("PATH", "User") $SENSING_DEV_ROOT= [Environment]::GetEnvironmentVariable("SENSING_DEV_ROOT", "User") @@ -179,7 +179,7 @@ jobs: cd Release && ./opencv_test - name: Test opencv (with the latest MSVC with OpenCV) - if: ${{(matrix.os == 'windows-latest') && (matrix.with_openCV == '-InstallOpenCV') && (matrix.install_option == '-version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}')}} + if: ${{ matrix.with_openCV == '-InstallOpenCV' && (matrix.os == 'windows-latest' && matrix.install_option == format('-version {0}', needs.set_env.outputs.LATEST_RELEASED_SDK)) }} run: | $PATH = [Environment]::GetEnvironmentVariable("PATH", "User") $SENSING_DEV_ROOT= [Environment]::GetEnvironmentVariable("SENSING_DEV_ROOT", "User")