From af8efa0f8ad3d942a2affc60e9d139e73ba04ad9 Mon Sep 17 00:00:00 2001 From: Xinyu Li Date: Thu, 20 Mar 2025 11:24:22 -0700 Subject: [PATCH 1/6] support for 24 --- .github/workflows/develop-Linux.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-Linux.yml b/.github/workflows/develop-Linux.yml index e5808378..5b3ece39 100644 --- a/.github/workflows/develop-Linux.yml +++ b/.github/workflows/develop-Linux.yml @@ -183,7 +183,7 @@ jobs: needs: [set_env, generate_config] strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-22.04,ubuntu-latest] python_version: ["3.10", "3.11"] steps: @@ -198,6 +198,16 @@ jobs: name: install-test-for-linux path: download + - name: Install libgirepository1 + if: ${{ matrix.os == 'ubuntu-22.04' }} + run: | + sudo apt install -y libgirepository1.0-dev + + - name: Install libgirepository2 + if: ${{ matrix.os == 'ubuntu-latest' }} + run: | + sudo apt install -y libgirepository2.0-dev + - name: Get config content and install python modules run: | apt-get -y upgrade && apt-get update && apt-get install -y jq @@ -217,7 +227,7 @@ jobs: pip install gendc-python==$gendc_separator_version pip install numpy pip install opencv-python - sudo apt install -y libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-4.0 + sudo apt install -y gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-4.0 pip install aravis-python pip3 install pycairo pip3 install PyGObject From 68086788886712b4fdbd60683d08c079b8affb4c Mon Sep 17 00:00:00 2001 From: Xinyu Li Date: Thu, 20 Mar 2025 11:27:01 -0700 Subject: [PATCH 2/6] support for 24 --- .github/workflows/develop-Linux.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-Linux.yml b/.github/workflows/develop-Linux.yml index 5b3ece39..493c149f 100644 --- a/.github/workflows/develop-Linux.yml +++ b/.github/workflows/develop-Linux.yml @@ -201,16 +201,17 @@ jobs: - name: Install libgirepository1 if: ${{ matrix.os == 'ubuntu-22.04' }} run: | + apt-get -y upgrade && apt-get update && apt-get install -y jq sudo apt install -y libgirepository1.0-dev - name: Install libgirepository2 if: ${{ matrix.os == 'ubuntu-latest' }} run: | + apt-get -y upgrade && apt-get update && apt-get install -y jq sudo apt install -y libgirepository2.0-dev - name: Get config content and install python modules - run: | - apt-get -y upgrade && apt-get update && apt-get install -y jq + run: | config_file="${{ github.workspace }}/download/build/config_Linux.json" ionkit_version=$(jq -r '.ion_kit.version' $config_file) gendc_separator_version=$(jq -r '.gendc_separator.version' $config_file) From fe636131fea4278efe6b0274af3ef82d37882ff3 Mon Sep 17 00:00:00 2001 From: Xinyu Li Date: Thu, 20 Mar 2025 11:29:26 -0700 Subject: [PATCH 3/6] support for 24 --- .github/workflows/develop-Linux.yml | 72 ++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/develop-Linux.yml b/.github/workflows/develop-Linux.yml index 493c149f..b50520f9 100644 --- a/.github/workflows/develop-Linux.yml +++ b/.github/workflows/develop-Linux.yml @@ -7,7 +7,7 @@ on: - main ### modify here for update ##################################################### -env: +env: TEST_CONFIG_VERSION_SDK: v99.99.99 REPO_NAME: Sensing-Dev/sensing-dev-installer ################################################################################ @@ -25,11 +25,11 @@ jobs: run: | latest_tag=$(curl -s https://api.github.com/repos/${{ env.REPO_NAME}}/releases/latest | jq -r .tag_name) echo "LATEST_RELEASED_SDK=${latest_tag}" >> $GITHUB_OUTPUT + + + + - - - - generate_config: runs-on: ubuntu-22.04 @@ -61,20 +61,20 @@ jobs: test_installation: runs-on: ${{ matrix.os }} - needs: [set_env, generate_config] + needs: [ set_env, generate_config ] strategy: - matrix: - os: [ubuntu-22.04] - install_option : ["--version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}", "--config-path config_Linux.json"] - with_openCV : ["", "--install-opencv"] - with_gst_option: ["", "--install-gst-tools", "--install-gst-tools --install-gst-plugin"] - exclude: - # InstallGstTools is not on the release version yet - - install_option: "--version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}" - with_gst_option: "--install-gst-tools" - - install_option: "--version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}" - with_gst_option: "--install-gst-tools --install-gst-plugin" + matrix: + os: [ ubuntu-22.04 ] + install_option: [ "--version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}", "--config-path config_Linux.json" ] + with_openCV: [ "", "--install-opencv" ] + with_gst_option: [ "", "--install-gst-tools", "--install-gst-tools --install-gst-plugin" ] + exclude: + # InstallGstTools is not on the release version yet + - install_option: "--version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}" + with_gst_option: "--install-gst-tools" + - install_option: "--version ${{ needs.set_env.outputs.LATEST_RELEASED_SDK }}" + with_gst_option: "--install-gst-tools --install-gst-plugin" steps: - name: Download All Artifacts @@ -84,7 +84,7 @@ jobs: path: download - name: Set all items under test directory - run: | + run: | mkdir -p ${{ github.workspace }}/test mv ${{ github.workspace }}/download/build/config_Linux.json ${{ github.workspace }}/test mv ${{ github.workspace }}/download/installer/tools/setup.sh ${{ github.workspace }}/test @@ -150,7 +150,7 @@ jobs: gst-inspect-1.0 echo "===" gst-inspect-1.0 queue - + - name: Test gst-plugin-base (v24.12 or later) if: ${{ matrix.with_gst_option == '--install-gst-tools --install-gst-plugin' }} run: | @@ -173,18 +173,18 @@ jobs: run: | export GST_PLUGIN_PATH=/opt/sensing-dev/lib/x86_64-linux-gnu/gstreamer-1.0/:$GST_PLUGIN_PATH gst-inspect-1.0 gendcseparator - - - - + + + + test_python: runs-on: ${{ matrix.os }} - needs: [set_env, generate_config] + needs: [ set_env, generate_config ] strategy: matrix: - os: [ubuntu-22.04,ubuntu-latest] - python_version: ["3.10", "3.11"] + os: [ ubuntu-22.04,ubuntu-latest ] + python_version: [ "3.10", "3.11" ] steps: - name: Setup Python @@ -201,17 +201,17 @@ jobs: - name: Install libgirepository1 if: ${{ matrix.os == 'ubuntu-22.04' }} run: | - apt-get -y upgrade && apt-get update && apt-get install -y jq - sudo apt install -y libgirepository1.0-dev + sudo apt-get update && sudo apt-get -y upgrade + sudo apt-get install -y libgirepository1.0-dev jq - name: Install libgirepository2 if: ${{ matrix.os == 'ubuntu-latest' }} run: | - apt-get -y upgrade && apt-get update && apt-get install -y jq - sudo apt install -y libgirepository2.0-dev + sudo apt-get update && sudo apt-get -y upgrade + sudo apt-get install -y libgirepository2.0-dev jq - name: Get config content and install python modules - run: | + run: | config_file="${{ github.workspace }}/download/build/config_Linux.json" ionkit_version=$(jq -r '.ion_kit.version' $config_file) gendc_separator_version=$(jq -r '.gendc_separator.version' $config_file) @@ -263,11 +263,11 @@ jobs: test_gst_opencv: runs-on: ${{ matrix.os }} - needs: [set_env, generate_config] + needs: [ set_env, generate_config ] strategy: matrix: - os: [ubuntu-22.04] - python_version: ["3.10", "3.11"] + os: [ ubuntu-22.04 ] + python_version: [ "3.10", "3.11" ] steps: - name: Setup Python @@ -282,14 +282,14 @@ jobs: path: download - name: Install Numpy - run: | + run: | pip3 install numpy - name: Install gstreamer run: | sudo apt-get update sudo apt-get install libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-tools gstreamer1.0-x gstreamer1.0-alsa gstreamer1.0-gl gstreamer1.0-gtk3 gstreamer1.0-qt5 gstreamer1.0-pulseaudio -y - + - name: Install OpenCV run: | pip3 install --no-binary opencv-python opencv-python==4.10.0.84 --verbose From bf118e24d619968a7af2e4de9923f28d52e0d381 Mon Sep 17 00:00:00 2001 From: Xinyu Li Date: Thu, 20 Mar 2025 11:32:06 -0700 Subject: [PATCH 4/6] support for 24 --- .github/workflows/develop-Linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-Linux.yml b/.github/workflows/develop-Linux.yml index b50520f9..236e33b1 100644 --- a/.github/workflows/develop-Linux.yml +++ b/.github/workflows/develop-Linux.yml @@ -201,13 +201,13 @@ jobs: - name: Install libgirepository1 if: ${{ matrix.os == 'ubuntu-22.04' }} run: | - sudo apt-get update && sudo apt-get -y upgrade + sudo apt-get update sudo apt-get install -y libgirepository1.0-dev jq - name: Install libgirepository2 if: ${{ matrix.os == 'ubuntu-latest' }} run: | - sudo apt-get update && sudo apt-get -y upgrade + sudo apt-get update sudo apt-get install -y libgirepository2.0-dev jq - name: Get config content and install python modules From 8d5e34560b1244ee9aaf26064838f5199b24484e Mon Sep 17 00:00:00 2001 From: Xinyu Li Date: Thu, 20 Mar 2025 11:34:12 -0700 Subject: [PATCH 5/6] support for 24 --- .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 236e33b1..a2091d48 100644 --- a/.github/workflows/develop-Linux.yml +++ b/.github/workflows/develop-Linux.yml @@ -208,7 +208,7 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: | sudo apt-get update - sudo apt-get install -y libgirepository2.0-dev jq + sudo apt-get install -y libgirepository-2.0-dev jq - name: Get config content and install python modules run: | From 899c26da193c15eacdc16ac242ebb4926eff8cbd Mon Sep 17 00:00:00 2001 From: Xinyu Li Date: Thu, 20 Mar 2025 12:04:10 -0700 Subject: [PATCH 6/6] support for 24 and 22 --- .github/workflows/develop-Linux.yml | 33 ++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/.github/workflows/develop-Linux.yml b/.github/workflows/develop-Linux.yml index a2091d48..f46418da 100644 --- a/.github/workflows/develop-Linux.yml +++ b/.github/workflows/develop-Linux.yml @@ -198,32 +198,49 @@ jobs: name: install-test-for-linux path: download - - name: Install libgirepository1 + - name: Get config content and install python modules for ubuntu-22 if: ${{ matrix.os == 'ubuntu-22.04' }} run: | sudo apt-get update sudo apt-get install -y libgirepository1.0-dev jq + config_file="${{ github.workspace }}/download/build/config_Linux.json" + ionkit_version=$(jq -r '.ion_kit.version' $config_file) + gendc_separator_version=$(jq -r '.gendc_separator.version' $config_file) + + if [[ $ionkit_version == v* ]]; then + ionkit_version=${ionkit_version:1} + fi + + if [[ $gendc_separator_version == v* ]]; then + gendc_separator_version=${gendc_separator_version:1} + fi + + pip install ion-contrib-python==$ionkit_version + pip install gendc-python==$gendc_separator_version + pip install numpy + pip install opencv-python + sudo apt install -y gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-4.0 + pip install aravis-python + pip3 install pycairo + pip3 install PyGObject==3.48.2 - - name: Install libgirepository2 + - name: Get config content and install python modules for ubuntu-latest if: ${{ matrix.os == 'ubuntu-latest' }} run: | sudo apt-get update sudo apt-get install -y libgirepository-2.0-dev jq - - - name: Get config content and install python modules - run: | config_file="${{ github.workspace }}/download/build/config_Linux.json" ionkit_version=$(jq -r '.ion_kit.version' $config_file) gendc_separator_version=$(jq -r '.gendc_separator.version' $config_file) - + if [[ $ionkit_version == v* ]]; then ionkit_version=${ionkit_version:1} fi - + if [[ $gendc_separator_version == v* ]]; then gendc_separator_version=${gendc_separator_version:1} fi - + pip install ion-contrib-python==$ionkit_version pip install gendc-python==$gendc_separator_version pip install numpy