Merge pull request #1812 from shimat/merge_ubuntu]

shimat · web-flow · commit 4b841773f42d · 2026-02-17T17:14:23.000+09:00
merge ubuntu workflows
diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml
@@ -146,7 +146,7 @@ jobs:
 
       - name: Create NuGet package
         env: 
-          BETA: ""
+          BETA: "-beta"
         run: |
           yyyymmdd=`date '+%Y%m%d'`
           echo $yyyymmdd
diff --git a/.github/workflows/publish_nuget.yml b/.github/workflows/publish_nuget.yml
@@ -22,18 +22,20 @@ jobs:
         uses: dawidd6/action-download-artifact@v14
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
-          workflow: ubuntu22.yml
-          name: artifacts_ubuntu_22
+          workflow: ubuntu.yml
+          name: artifacts_ubuntu_22.04
           branch: ${{ github.ref_name }}
 
       - name: Download ubuntu 24 artifact
         uses: dawidd6/action-download-artifact@v14
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
-          workflow: ubuntu24.yml
-          name: artifacts_ubuntu_24
+          workflow: ubuntu.yml
+          name: artifacts_ubuntu_24.04
           branch: ${{ github.ref_name }}
 
+
+
       - name: Download ubuntu arm artifact
         uses: dawidd6/action-download-artifact@v14
         with:
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -1,4 +1,4 @@
-name: Ubuntu 22.04
+name: Ubuntu
 
 on:
   pull_request:
@@ -13,9 +13,17 @@ env:
   OPENCV_CACHE_VERSION: 2
 
 jobs:
-  build:
+  build_test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ubuntu: "22.04"
+            gtk_package: libgtk2.0-dev
+          - ubuntu: "24.04"
+            gtk_package: libgtk-3-dev
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-${{ matrix.ubuntu }}
     
     steps:
       - uses: actions/checkout@v6
@@ -34,7 +42,7 @@ jobs:
             cmake \
             libtbb-dev \
             libatlas-base-dev \
-            libgtk2.0-dev \
+            ${{ matrix.gtk_package }} \
             libavcodec-dev \
             libavformat-dev \
             libswscale-dev \
@@ -54,7 +62,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ${{ github.workspace }}/opencv_artifacts/
-          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu22-rev${{ env.OPENCV_CACHE_VERSION }}
+          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}-rev${{ env.OPENCV_CACHE_VERSION }}
 
       - name: Checkout OpenCV
         if: steps.opencv-cache.outputs.cache-hit != 'true'
@@ -74,12 +82,11 @@ jobs:
       - name: Build OpenCV
         if: steps.opencv-cache.outputs.cache-hit != 'true'
         run: |
-          mkdir opencv/build && cd opencv/build
           cmake \
-            -S . \
-            -B build \
+            -S opencv \
+            -B opencv/build \
             -D CMAKE_BUILD_TYPE=Release \
-            -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
+            -D OPENCV_EXTRA_MODULES_PATH=${GITHUB_WORKSPACE}/opencv_contrib/modules \
             -D BUILD_SHARED_LIBS=OFF \
             -D ENABLE_CXX11=ON \
             -D BUILD_EXAMPLES=OFF \
@@ -115,20 +122,22 @@ jobs:
             -D WITH_GSTREAMER=OFF \
             -D WITH_ADE=OFF \
             -D OPENCV_ENABLE_NONFREE=ON \
-            -D CMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_artifacts ..
-          cmake --build build
-          cmake --install build
+            -D CMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_artifacts
+          cmake --build opencv/build -j 3
+          cmake --install opencv/build
           sudo ldconfig
-          cd ${GITHUB_WORKSPACE}
           ls
       
       - name: Build OpenCvSharpExtern
         run: |
-          mkdir opencvsharp/src/build && cd $_
-          cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts ..
-          make -j
-          ls OpenCvSharpExtern
-          cp OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/nuget/
+          cmake \
+            -S opencvsharp/src \
+            -B opencvsharp/src/build \
+            -D CMAKE_BUILD_TYPE=Release \
+            -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts
+          cmake --build opencvsharp/src/build -j
+          ls opencvsharp/src/build/OpenCvSharpExtern
+          cp opencvsharp/src/build/OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/nuget/
 
       - name: Check OpenCvSharpExtern
         run: |
@@ -143,31 +152,32 @@ jobs:
         uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '8.0.x'
+        
+      - name: Test
+        run: |
+          cd ${GITHUB_WORKSPACE}/opencvsharp/test/OpenCvSharp.Tests
+          dotnet build -c Release -f net8.0
+          cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/test/OpenCvSharp.Tests/bin/Release/net8.0/
+          cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/test/OpenCvSharp.Tests/
+          sudo cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so /usr/lib/
+          LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 --runtime linux-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
 
       - name: Create NuGet package
-        env: 
-          BETA: ""
+        env:
+          BETA: "-beta"
         run: |
           yyyymmdd=`date '+%Y%m%d'`
           echo $yyyymmdd
           version="${OPENCV_VERSION}.${yyyymmdd}${BETA}"
           echo "Package version: $version"
-          
+
           cd ${GITHUB_WORKSPACE}/opencvsharp
-          dotnet pack nuget/OpenCvSharp4.official.runtime.ubuntu.22.04-x64.csproj -o ${GITHUB_WORKSPACE}/artifacts_ubuntu -p:Version=$version
-          
-          ls ${GITHUB_WORKSPACE}/artifacts_ubuntu
+          package_project="OpenCvSharp4.official.runtime.ubuntu.${{ matrix.ubuntu }}-x64.csproj"
+          dotnet pack "nuget/${package_project}" -o ${GITHUB_WORKSPACE}/artifacts -p:Version=$version
+
+          ls ${GITHUB_WORKSPACE}/artifacts
 
       - uses: actions/upload-artifact@v6
         with:
-          name: artifacts_ubuntu_22
-          path: artifacts_ubuntu
-        
-      - name: Test
-        run: |
-          cd ${GITHUB_WORKSPACE}/opencvsharp/test/OpenCvSharp.Tests
-          dotnet build -c Release -f net8.0
-          cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/test/OpenCvSharp.Tests/bin/Release/net8.0/
-          cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/test/OpenCvSharp.Tests/
-          sudo cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so /usr/lib/
-          LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 --runtime linux-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
+          name: artifacts_ubuntu_${{ matrix.ubuntu }}
+          path: artifacts
diff --git a/.github/workflows/ubuntu24.yml b/.github/workflows/ubuntu24.yml
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -156,7 +156,7 @@ jobs:
 
       - name: Create NuGet package
         env: 
-          BETA: ""
+          BETA: "-beta"
         run: |
           yyyymmdd=`date '+%Y%m%d'`
           echo $yyyymmdd
diff --git a/README.md b/README.md
@@ -74,12 +74,12 @@ dotnet run
 ```
 
 ### Other Linux distributions
-Add `OpenCvSharp4` and `OpenCvSharp4.official.runtime.linux-x64` NuGet packages to your project. This package is built on Ubuntu 24.04 and may work on other recent Linux distributions.
+Add `OpenCvSharp4` and the appropriate Ubuntu runtime package (for example `OpenCvSharp4.official.runtime.ubuntu.24.04-x64`) to your project. The Ubuntu runtime packages are built on the specified Ubuntu releases and may work on similar distributions.
 ```
 dotnet new console -n ConsoleApp01
 cd ConsoleApp01
 dotnet add package OpenCvSharp4
-dotnet add package OpenCvSharp4.official.runtime.linux-x64
+dotnet add package OpenCvSharp4.official.runtime.ubuntu.24.04-x64
 # -- edit Program.cs --- # 
 dotnet run
 ```
@@ -162,7 +162,6 @@ http://shimat.github.io/opencvsharp/api/OpenCvSharp.html
 |---------|-------------|------|
 |**OpenCvSharp4.runtime.win**| Native bindings for Windows x64/x86 (except UWP) | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.runtime.win.svg)](https://badge.fury.io/nu/OpenCvSharp4.runtime.win) |
 |**OpenCvSharp4.runtime.uwp**| Native bindings for UWP (Universal Windows Platform) x64/x86/ARM | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.runtime.uwp.svg)](https://badge.fury.io/nu/OpenCvSharp4.runtime.uwp) |
-|**OpenCvSharp4.official.runtime.linux-x64**| Native bindings for Linux x64 (built on Ubuntu 24.04) | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.official.runtime.linux-x64.svg)](https://badge.fury.io/nu/OpenCvSharp4.official.runtime.linux-x64) |
 |**OpenCvSharp4.official.runtime.ubuntu.22.04-x64**| Native bindings for Ubuntu 22.04 x64 | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.official.runtime.ubuntu.22.04-x64.svg)](https://badge.fury.io/nu/OpenCvSharp4.official.runtime.ubuntu.22.04-x64) |
 |**OpenCvSharp4.official.runtime.ubuntu.24.04-x64**| Native bindings for Ubuntu 24.04 x64 | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.official.runtime.ubuntu.24.04-x64.svg)](https://badge.fury.io/nu/OpenCvSharp4.official.runtime.ubuntu.24.04-x64) |
 |**OpenCvSharp4.runtime.linux-arm**| Native bindings for Linux Arm | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.runtime.linux-arm.svg)](https://www.nuget.org/packages/OpenCvSharp4.runtime.linux-arm/) |
diff --git a/docfx/articles/intro.md b/docfx/articles/intro.md
@@ -26,7 +26,6 @@ dotnet add package OpenCvSharp4
 # Native bindings (choose one based on your platform)
 dotnet add package OpenCvSharp4.runtime.win                      # Windows
 dotnet add package OpenCvSharp4.runtime.ubuntu.24.04-x64         # Ubuntu 24.04
-dotnet add package OpenCvSharp4.official.runtime.linux-x64       # Linux (generic)
 ```
 
 ### Quick Example
diff --git a/nuget/OpenCvSharp4.official.runtime.linux-x64.csproj b/nuget/OpenCvSharp4.official.runtime.linux-x64.csproj
