merge ubuntu workflows

.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

.github/workflows/publish_nuget.yml

@@ -22,18 +22,26 @@ jobs:
         uses: dawidd6/action-download-artifact@v14
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
-          workflow: ubuntu22.yml
+          workflow: ubuntu.yml
           name: artifacts_ubuntu_22
           branch: ${{ github.ref_name }}
 
       - name: Download ubuntu 24 artifact
         uses: dawidd6/action-download-artifact@v14
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
-          workflow: ubuntu24.yml
+          workflow: ubuntu.yml
           name: artifacts_ubuntu_24
           branch: ${{ github.ref_name }}
 
+      - name: Download linux x64 artifact
+        uses: dawidd6/action-download-artifact@v14
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          workflow: ubuntu.yml
+          name: artifacts_linux_x64
+          branch: ${{ github.ref_name }}
+
       - name: Download ubuntu arm artifact
         uses: dawidd6/action-download-artifact@v14
         with:

.github/workflows/ubuntu22.yml → .github/workflows/ubuntu.yml

@@ -1,4 +1,4 @@
-name: Ubuntu 22.04
+name: Ubuntu
 
 on:
   pull_request:
@@ -13,9 +13,23 @@ env:
   OPENCV_CACHE_VERSION: 2
 
 jobs:
-  build:
+  build_test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ubuntu: "22.04"
+            runner: ubuntu-22.04
+            gtk_package: libgtk2.0-dev
+            cache_suffix: ubuntu22
+            package_projects: "OpenCvSharp4.official.runtime.ubuntu.22.04-x64.csproj"
+          - ubuntu: "24.04"
+            runner: ubuntu-24.04
+            gtk_package: libgtk-3-dev
+            cache_suffix: ubuntu24
+            package_projects: "OpenCvSharp4.official.runtime.ubuntu.24.04-x64.csproj OpenCvSharp4.official.runtime.linux-x64.csproj"
 
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.runner }}
 
     steps:
       - uses: actions/checkout@v6
@@ -34,7 +48,7 @@ jobs:
             cmake \
             libtbb-dev \
             libatlas-base-dev \
-            libgtk2.0-dev \
+            ${{ matrix.gtk_package }} \
             libavcodec-dev \
             libavformat-dev \
             libswscale-dev \
@@ -54,7 +68,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 }}-${{ matrix.cache_suffix }}-rev${{ env.OPENCV_CACHE_VERSION }}
 
       - name: Checkout OpenCV
         if: steps.opencv-cache.outputs.cache-hit != 'true'
@@ -74,12 +88,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 +128,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 +158,33 @@ 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
+          for project in ${{ matrix.package_projects }}; do
+            dotnet pack nuget/$project -o ${GITHUB_WORKSPACE}/artifacts -p:Version=$version
+          done
+
+          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

.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