Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}"
Expand Down Expand Up @@ -366,4 +354,4 @@ jobs:
uses: andstor/file-existence-action@v3
with:
files: "/opt/sensing-dev/version_info.json"
fail: true
fail: true
14 changes: 2 additions & 12 deletions .github/workflows/develop-MSVC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
id-token: write
strategy:
matrix:
os: [windows-2019, windows-2022]
os: [windows-2022]
needs: build
steps:
- name: Checkout repository
Expand Down Expand Up @@ -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'
Expand All @@ -165,3 +154,4 @@ jobs:
cd installer/testcases/cpp/opencv_test && cmake ./
cmake --build . --config Release
cd Release && ./opencv_test

6 changes: 3 additions & 3 deletions installer/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion installer/tools/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment thread
Fixstars-momoko marked this conversation as resolved.
)

unset gendc_separator_config
Expand All @@ -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
Expand All @@ -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
Expand Down