From 4fd1ffac9fd459e8dfb23850ed44b517bd26976e Mon Sep 17 00:00:00 2001 From: Xinyu Li Date: Fri, 27 Feb 2026 03:14:20 -0800 Subject: [PATCH 1/4] update ion-kit version --- .github/workflows/Release.yml | 14 +------------- .github/workflows/develop-Windows.yml | 7 +------ installer/config.yml | 4 ++-- installer/tools/installer.ps1 | 2 +- 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 4867b375..00d539b3 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -116,7 +116,7 @@ jobs: strategy: matrix: - os: [windows-2019, windows-latest] + os: [windows-latest] version : ["-version ${{ needs.set_env.outputs.ref_name }}", "-version v24.05.08", "-version v24.01.04", ""] with_openCV : ["", "-InstallOpenCV"] exclude: @@ -173,15 +173,3 @@ jobs: cd ${{ github.workspace }}/download/installer/testcases/cpp/ionkit_test && cmake ./ cmake --build . --config Release cd Release && ls && ./ionkit_test - - - name: Test opencv (general) - if: ${{ (matrix.os == 'windows-2019') && (matrix.with_openCV == '-InstallOpenCV')}} - run: | - $sensingdevShortVersion = '${{ matrix.version }}' -replace "-version ", "" - $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 ./ -DSDK_VERSION="$sensingdevShortVersion" - cmake --build . --config Release - cd Release && ls && ./opencv_test diff --git a/.github/workflows/develop-Windows.yml b/.github/workflows/develop-Windows.yml index 3de9431a..fb0e3b58 100644 --- a/.github/workflows/develop-Windows.yml +++ b/.github/workflows/develop-Windows.yml @@ -89,7 +89,7 @@ jobs: strategy: matrix: - os: [windows-2019, windows-latest] + os: [windows-latest] install_option : ["-version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}", "-configPath config_Windows.json"] with_openCV : ["", "-InstallOpenCV"] # exclude: @@ -224,11 +224,6 @@ jobs: with: python-version: ${{ matrix.python_version }} - - name: Setup winget - uses: Cyberboss/install-winget@v1 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Download All Artifacts uses: actions/download-artifact@v4 with: diff --git a/installer/config.yml b/installer/config.yml index e4af6b63..52b88a62 100644 --- a/installer/config.yml +++ b/installer/config.yml @@ -13,9 +13,9 @@ libraries: ion_kit: name: ion-kit - pkg_sha: "6714b46f4f9f6db0806e78e69e1fee6188e520a5dfca5b134d1e007ae410fa33" + pkg_sha: "6152924b797a532562ca9d0c05f81930f8796f924a3395232546faf958af6701" git_repo: "https://github.com/fixstars/ion-kit.git" - version: "v3.2.6" + version: "v3.2.8" opencv: name: opencv diff --git a/installer/tools/installer.ps1 b/installer/tools/installer.ps1 index 37948b70..44487d75 100644 --- a/installer/tools/installer.ps1 +++ b/installer/tools/installer.ps1 @@ -112,7 +112,7 @@ function CheckSDKVersion(){ try { # Write-Host "https://github.com/$repositoryName/releases/$sdkversion" - $response = Invoke-WebRequest -Uri "https://github.com/$repositoryName/releases/tag/$sdkversion" -ErrorAction Stop + $response = Invoke-WebRequest -Uri "https://github.com/$repositoryName/releases/tag/$sdkversion" -UseBasicParsing -ErrorAction Stop if ($response.StatusCode -ne 200){ Write-Error "Version $sdkversion does not exist" From 4918b1ebcbf8a72f467bfc95a929f718174d9dbd Mon Sep 17 00:00:00 2001 From: fixstars_xinyu <143661893+xinyuli1204@users.noreply.github.com> Date: Fri, 27 Feb 2026 03:22:23 -0800 Subject: [PATCH 2/4] update cdci --- .github/workflows/develop-Windows.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-Windows.yml b/.github/workflows/develop-Windows.yml index fb0e3b58..31eeda87 100644 --- a/.github/workflows/develop-Windows.yml +++ b/.github/workflows/develop-Windows.yml @@ -18,9 +18,12 @@ name: Generate Windows Config and test installation with script # TODO: after separate C++ and Python installation of Aravis, setup test on: + push: + branches-ignore: + - main # This will run the build and test jobs for every push on all branches except for dev to main + pull_request: - branches: - - main + branches: [ release/v24.09 ] ### modify here for update ##################################################### env: From dbfe9842e450d32b10a8d7b2c325bd8c613e967c Mon Sep 17 00:00:00 2001 From: fixstars_xinyu <143661893+xinyuli1204@users.noreply.github.com> Date: Fri, 27 Feb 2026 03:46:11 -0800 Subject: [PATCH 3/4] update linux cdci --- .github/workflows/develop-Linux.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-Linux.yml b/.github/workflows/develop-Linux.yml index 4b56e28c..5ad585d2 100644 --- a/.github/workflows/develop-Linux.yml +++ b/.github/workflows/develop-Linux.yml @@ -14,9 +14,12 @@ name: Generate Linux Config and test installation with script # TODO: after separate C++ and Python installation of Aravis, setup test on: + push: + branches-ignore: + - main # This will run the build and test jobs for every push on all branches except for dev to main + pull_request: - branches: - - main + branches: [ release/v24.09 ] ### modify here for update ##################################################### env: From 207671f6c0c122c3a7971983d6f47995b4ba55aa Mon Sep 17 00:00:00 2001 From: fixstars_xinyu <143661893+xinyuli1204@users.noreply.github.com> Date: Fri, 27 Feb 2026 03:52:57 -0800 Subject: [PATCH 4/4] Update develop-Linux.yml --- .github/workflows/develop-Linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop-Linux.yml b/.github/workflows/develop-Linux.yml index 5ad585d2..b2b9fd08 100644 --- a/.github/workflows/develop-Linux.yml +++ b/.github/workflows/develop-Linux.yml @@ -190,7 +190,7 @@ jobs: sudo apt install -y libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-4.0 pip install aravis-python pip3 install pycairo - pip3 install PyGObject + pip3 install PyGObject==3.48.2 - name: Test Aravis run: |