Skip to content
Open
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
14 changes: 1 addition & 13 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
9 changes: 6 additions & 3 deletions .github/workflows/develop-Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -187,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: |
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/develop-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -89,7 +92,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:
Expand Down Expand Up @@ -224,11 +227,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:
Expand Down
4 changes: 2 additions & 2 deletions installer/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion installer/tools/installer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down