diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index d44fb112..c4606852 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -179,7 +179,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-2019, windows-2022] + os: [windows-2022] options: [ "-user $env:USERNAME -InstallOpenCV", "-user $env:USERNAME"] version: ['current'] exclude: @@ -310,18 +310,6 @@ jobs: cd Release && ls && ./ionkit_test echo "ion-kit test passed" - - name: Test opencv - if: matrix.options == '-user $env:USERNAME -InstallOpenCV' && matrix.os == 'windows-2019' - 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 installer/testcases/cpp/opencv_test && cmake ./ - cmake --build . --config Release - cd Release && ./opencv_test - echo "opencv test passed" - - name: Check if version_info.json exists run: | $expected_install_path = Join-Path -Path "${{ env.INSTALL_PATH }}" -ChildPath "${{ env.SDK_NAME }}" @@ -366,4 +354,4 @@ jobs: uses: andstor/file-existence-action@v3 with: files: "/opt/sensing-dev/version_info.json" - fail: true \ No newline at end of file + fail: true diff --git a/.github/workflows/develop-MSVC.yml b/.github/workflows/develop-MSVC.yml index 06b42043..dd5f686d 100644 --- a/.github/workflows/develop-MSVC.yml +++ b/.github/workflows/develop-MSVC.yml @@ -93,7 +93,7 @@ jobs: id-token: write strategy: matrix: - os: [windows-2019, windows-2022] + os: [windows-2022] needs: build steps: - name: Checkout repository @@ -134,17 +134,6 @@ jobs: cd Release && ./ionkit_test echo "ion-kit test passed" - - name: Test opencv for MSVC 2019 - if: matrix.os == 'windows-2019' - run: | - $BINPATH="${HOME}/sensing-dev/bin" - $OPENCVBIN="${HOME}/sensing-dev/opencv/build/x64/vc15/bin" - $env:PATH="$env:PATH;$BINPATH" - $env:PATH="$env:PATH;$OPENCVBIN" - $env:SENSING_DEV_ROOT="${HOME}/sensing-dev" - cd installer/testcases/cpp/opencv_test && cmake ./ - cmake --build . --config Release - cd Release && ./opencv_test - name: Install OpenCV separately on Windows MSVC 2022 if: matrix.os == 'windows-2022' @@ -165,3 +154,4 @@ jobs: cd installer/testcases/cpp/opencv_test && cmake ./ cmake --build . --config Release cd Release && ./opencv_test + diff --git a/installer/config.yml b/installer/config.yml index cc65f06e..c51e8751 100644 --- a/installer/config.yml +++ b/installer/config.yml @@ -34,10 +34,10 @@ libraries: src_path: ion-kit install_path: install/ion-kit action: download # can be 'download', 'build', or 'use_existing' - pkg_url: "https://github.com/fixstars/ion-kit/releases/download/v1.8.10/ion-kit-1.8.10-x86-64-windows.zip" - pkg_sha: "91aa157baafec5ef44e09d25f0fee7a982495c4e83f6b16913673a55ccbf83a8" + pkg_url: "https://github.com/fixstars/ion-kit/releases/download/v1.8.11/ion-kit-1.8.11-x86-64-windows.zip" + pkg_sha: "aff49a375606797a8d78d39b149d135acf6c846cf008e30abb52add33ff5fa0a" git_repo: "https://github.com/fixstars/ion-kit.git" - version: "v1.8.10" + version: "v1.8.11" opencv: name: opencv diff --git a/installer/tools/setup.sh b/installer/tools/setup.sh index 92d8b875..98eed56e 100644 --- a/installer/tools/setup.sh +++ b/installer/tools/setup.sh @@ -37,6 +37,7 @@ declare -A ion_kit_config=( # Declare an associative array with default values ["v24.05.10"]="v1.8.8" ["v24.05.11"]="v1.8.9" ["v24.05.12"]="v1.8.10" + ["v24.05.13"]="v1.8.11" ) unset gendc_separator_config @@ -50,6 +51,7 @@ declare -A gendc_separator_config=( # Declare an associative array with default ["v24.05.10"]="v0.2.8" ["v24.05.11"]="v0.2.8" ["v24.05.12"]="v0.2.8" + ["v24.05.13"]="v0.2.8" ) unset aravis_config @@ -62,7 +64,8 @@ declare -A aravis_config=( # Declare an associative array with default values ["v24.05.09"]="0.8.30-internal" ["v24.05.10"]="0.8.30-internal" ["v24.05.11"]="v0.8.30-internal.1" - ["v24.05.12"]="v0.8.30-internal.1" + ["v24.05.13"]="v0.8.30-internal.1" + ["v24.05.13"]="v0.8.30-internal.1" ) unset aravis_url