Merge branch 'main' of https://github.com/shimat/opencvsharp

Author: shimat

.github/docker-appengine.yml

@@ -0,0 +1,130 @@
+name: Cleanup GitHub Actions Cache
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch name (leave empty for current branch)'
+        required: false
+        type: string
+      key_pattern:
+        description: 'Cache key pattern (e.g., buildx, gha, leave empty for all)'
+        required: false
+        type: string
+      max_age_days:
+        description: 'Delete caches older than N days (0 = all)'
+        required: false
+        default: '0'
+        type: string
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: read
+    steps:
+      - name: Cleanup caches
+        shell: pwsh
+        run: |
+          Write-Host "Starting cache cleanup..."
+          
+          $branch = "${{ github.event.inputs.branch }}"
+          $keyPattern = "${{ github.event.inputs.key_pattern }}"
+          $maxAgeDays = "${{ github.event.inputs.max_age_days }}"
+          
+          # Get cache list
+          if ($branch) {
+            Write-Host "Filtering by branch: $branch"
+            $cacheListJson = gh cache list --repo ${{ github.repository }} --branch $branch --json id,key,createdAt,sizeInBytes --limit 1000
+          } else {
+            Write-Host "Getting all caches..."
+            $cacheListJson = gh cache list --repo ${{ github.repository }} --json id,key,createdAt,sizeInBytes --limit 1000
+          }
+          
+          $caches = $cacheListJson | ConvertFrom-Json
+          
+          # Filter by key pattern if specified
+          if ($keyPattern) {
+            Write-Host "Filtering by key pattern: $keyPattern"
+            $caches = $caches | Where-Object { $_.key -like "*$keyPattern*" }
+          }
+          
+          # Filter by age if specified
+          if ($maxAgeDays -ne "0") {
+            $cutoffDate = (Get-Date).AddDays(-[int]$maxAgeDays).ToUniversalTime()
+            Write-Host "Filtering caches older than: $($cutoffDate.ToString('yyyy-MM-ddTHH:mm:ssZ'))"
+            $caches = $caches | Where-Object { [DateTime]::Parse($_.createdAt) -lt $cutoffDate }
+          }
+          
+          $cacheCount = $caches.Count
+          Write-Host "Found $cacheCount caches to delete"
+          
+          if ($cacheCount -eq 0) {
+            Write-Host "No caches to delete"
+            exit 0
+          }
+          
+          # Calculate total size
+          $totalBytes = ($caches | Measure-Object -Property sizeInBytes -Sum).Sum
+          $totalSizeMB = [math]::Round($totalBytes / 1MB, 2)
+          $totalSizeGB = [math]::Round($totalBytes / 1GB, 2)
+          
+          # Display summary
+          Write-Host "`n========== DELETION SUMMARY =========="
+          Write-Host "Total caches to delete: $cacheCount"
+          Write-Host "Total size: $totalSizeMB MB ($totalSizeGB GB)"
+          Write-Host "======================================`n"
+          
+          # Display cache details
+          Write-Host "Caches to be deleted:"
+          Write-Host ("{0,-60} {1,-20} {2,10}" -f "Key", "Last Updated", "Size (MB)")
+          Write-Host ("{0,-60} {1,-20} {2,10}" -f "---", "------------", "---------")
+          
+          $displayCount = [Math]::Min(20, $cacheCount)
+          for ($i = 0; $i -lt $displayCount; $i++) {
+            $cache = $caches[$i]
+            $sizeMB = [math]::Round($cache.sizeInBytes / 1MB, 2)
+            $lastUpdate = [DateTime]::Parse($cache.createdAt).ToString("yyyy-MM-dd HH:mm")
+            $keyDisplay = if ($cache.key.Length -gt 57) { $cache.key.Substring(0, 54) + "..." } else { $cache.key }
+            Write-Host ("{0,-60} {1,-20} {2,10}" -f $keyDisplay, $lastUpdate, $sizeMB)
+          }
+          
+          if ($cacheCount -gt 20) {
+            Write-Host "... and $($cacheCount - 20) more caches"
+          }
+          
+          # Delete caches
+          Write-Host "`nDeleting caches..."
+          $deleted = 0
+          $failed = 0
+          $deletedSize = 0
+          
+          foreach ($cache in $caches) {
+            try {
+              gh cache delete $cache.id --repo ${{ github.repository }} 2>&1 | Out-Null
+              if ($LASTEXITCODE -eq 0) {
+                $deleted++
+                $deletedSize += $cache.sizeInBytes
+                Write-Host "✓ Deleted: $($cache.key.Substring(0, [Math]::Min(50, $cache.key.Length)))"
+              } else {
+                $failed++
+                Write-Host "✗ Failed: $($cache.key.Substring(0, [Math]::Min(50, $cache.key.Length)))"
+              }
+            } catch {
+              $failed++
+              Write-Host "✗ Failed: $($cache.key.Substring(0, [Math]::Min(50, $cache.key.Length)))"
+            }
+          }
+          
+          # Final summary
+          $deletedSizeMB = [math]::Round($deletedSize / 1MB, 2)
+          $deletedSizeGB = [math]::Round($deletedSize / 1GB, 2)
+          
+          Write-Host "`n========== CLEANUP COMPLETE =========="
+          Write-Host "Successfully deleted: $deleted caches"
+          Write-Host "Failed: $failed caches"
+          Write-Host "Total freed space: $deletedSizeMB MB ($deletedSizeGB GB)"
+          Write-Host "======================================"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cleanup-cache.yml

@@ -13,12 +13,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
 
       - name: Install .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 8.0.x
 

.github/workflows/docfx.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   DEBIAN_FRONTEND: noninteractive
-  DOCKER_IMAGE_NAME1: "ubuntu24-dotnet8-opencv4.12.0"
+  DOCKER_IMAGE_NAME1: "ubuntu24-dotnet10-opencv4.13.0"
 
 jobs:
   build:
@@ -27,7 +27,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 1
 

.github/workflows/docker-deploy.yml

@@ -0,0 +1,33 @@
+name: Docker Test
+
+on:
+  pull_request:
+    types: [synchronize, opened]
+
+env:
+  DEBIAN_FRONTEND: noninteractive
+  OPENCV_VERSION: 4.13.0
+  DOCKER_BUILD_CONTEXT: ./docker/ubuntu24-dotnet10-opencv4.13.0
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Build with Docker
+        uses: docker/build-push-action@v6
+        with:
+          context: ${{ env.DOCKER_BUILD_CONTEXT }}
+          build-args: |
+            OPENCV_VERSION=${{ env.OPENCV_VERSION }}
+            OPENCVSHARP_REF=${{ github.head_ref || github.ref_name }}
+          outputs: type=docker,name=shimat/ubuntu24-dotnet10-opencv4.13.0:latest
+          cache-from: |
+            type=gha,scope=${{ github.ref_name }}
+            type=gha,scope=main
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}

.github/workflows/docker-test-ubuntu.yml

@@ -1,4 +1,4 @@
-name: Linux ARM (Docker)
+name: Linux ARM
 
 on:
   pull_request:
@@ -9,36 +9,36 @@ on:
 
 env:
   DEBIAN_FRONTEND: noninteractive
-  OPENCV_VERSION: 4.12.0
+  OPENCV_VERSION: 4.13.0
+  DOCKER_BUILD_CONTEXT: ./docker/ubuntu24-dotnet10-opencv4.13.0
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
-      - uses: actions/checkout@v4
-
-      - uses: docker/setup-qemu-action@v3
+      - uses: actions/checkout@v6
 
       - uses: docker/setup-buildx-action@v3
-        with:
-          install: true
 
       # Build with Buildx and cache Docker layers in GitHub Actions cache
-      - name: Build with Docker (cached)
+      - name: Build with Docker (native ARM64)
         uses: docker/build-push-action@v6
         with:
-          context: ./docker/ubuntu24-dotnet8-opencv4.12.0
-          platforms: linux/arm64
+          context: ${{ env.DOCKER_BUILD_CONTEXT }}
           build-args: |
             OPENCV_VERSION=${{ env.OPENCV_VERSION }}
-          # Load the built image to local Docker for later docker create/cp
+            OPENCVSHARP_REF=${{ github.head_ref || github.ref_name }}
           outputs: type=docker,name=opencvsharp-linux-arm:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          # Use branch-specific cache keys to avoid using stale code from other branches
+          cache-from: |
+            type=gha,scope=${{ github.ref_name }}
+            type=gha,scope=main
+          # Save cache with branch-specific scope
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}
 
       - name: Extract build files from Docker instance
         run: |
-          docker create -ti --name opencvsharp-linux-arm-tmp opencvsharp-linux-arm bash
+          docker create -ti --name opencvsharp-linux-arm-tmp opencvsharp-linux-arm:latest bash
           docker cp opencvsharp-linux-arm-tmp:/artifacts .
 
       - name: Patch nuspec with version and build NuGet package

.github/workflows/docker-ubuntu.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: macos-11
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 1
 
@@ -27,7 +27,7 @@ jobs:
 
 #      - name: Cache OpenCV
 #        id: opencv-cache
-#        uses: actions/cache@v3
+#        uses: actions/cache@v5
 #        with:
 #          path: ${{ github.workspace }}/opencv_macos/
 #          key: opencv-${{ env.OPENCV_VERSION }}-macos-rev1
@@ -104,7 +104,7 @@ jobs:
           LD_LIBRARY_PATH=. ./test
 
       - name: Install .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '6.0.x'
 
@@ -128,14 +128,14 @@ jobs:
         run: |
           cd ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests
           # ls
-          dotnet build -c Release -f net6.0
-          cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net6.0/
+          dotnet build -c Release -f net8.0
+          cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net8.0/
           cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/
-          # ls ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net6.0/
+          # ls ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net8.0/
           # ls
           sudo cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib /usr/local/lib/
           LD_LIBRARY_PATH=. 
-          dotnet test OpenCvSharp.Tests.csproj -c Release -f net6.0 --runtime osx-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
+          dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 --runtime osx-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
           ls
           ls TestResults
 

.github/workflows/linux-arm.yml

@@ -5,10 +5,10 @@ on:
 
 jobs:
   Publish:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Download windows artifact
         uses: dawidd6/action-download-artifact@v6
@@ -49,7 +49,7 @@ jobs:
           ls -l
 
       - name: Install .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 8.0.x