From 47ae649cc450e26c8f08246c4151cb3b846f5aa1 Mon Sep 17 00:00:00 2001
From: shimat <schimatk@gmail.com>
Date: Fri, 15 Aug 2025 23:02:50 +0900
Subject: [PATCH 1/2] Update linux-arm.yml

---
 .github/workflows/linux-arm.yml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml
index d21d7ee89..14e118c54 100644
--- a/.github/workflows/linux-arm.yml
+++ b/.github/workflows/linux-arm.yml
@@ -9,29 +9,32 @@ on:
 
 env:
   DEBIAN_FRONTEND: noninteractive
-  OPENCV_VERSION: 4.11.0
+  OPENCV_VERSION: 4.12.0
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
+      - uses: docker/setup-qemu-action@v3
+
       - uses: docker/setup-buildx-action@v3
         with:
           install: true
 
-      - uses: docker/setup-qemu-action@v3
-          
-      - name: Build with Docker
-        run: |
-          # Override OpenCV version in Dockerfile
-          docker build \
-            -t opencvsharp-linux-arm:latest \
-            --output=type=docker \
-            --platform=linux/arm/v7 \
-            --build-arg OPENCV_VERSION \
-            ./docker/ubuntu22-dotnet6-opencv4.8.0
+      # Build with Buildx and cache Docker layers in GitHub Actions cache
+      - name: Build with Docker (cached)
+        uses: docker/build-push-action@v6
+        with:
+          context: ./docker/ubuntu24-dotnet8-opencv4.12.0
+          platforms: linux/arm/v7
+          build-args: |
+            OPENCV_VERSION=${{ env.OPENCV_VERSION }}
+          # Load the built image to local Docker for later docker create/cp
+          outputs: type=docker,name=opencvsharp-linux-arm:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Extract build files from Docker instance
         run: |

From 9c9a853a33661fa6811fde5dc4ecaf0b2e7e02e7 Mon Sep 17 00:00:00 2001
From: shimat <schimatk@gmail.com>
Date: Fri, 15 Aug 2025 23:55:47 +0900
Subject: [PATCH 2/2] Update linux-arm.yml

---
 .github/workflows/linux-arm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml
index 14e118c54..06c921f3a 100644
--- a/.github/workflows/linux-arm.yml
+++ b/.github/workflows/linux-arm.yml
@@ -28,7 +28,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./docker/ubuntu24-dotnet8-opencv4.12.0
-          platforms: linux/arm/v7
+          platforms: linux/arm64
           build-args: |
             OPENCV_VERSION=${{ env.OPENCV_VERSION }}
           # Load the built image to local Docker for later docker create/cp