Merge remote-tracking branch 'upstream/main' into ei-npu-support

Author: rjtokenring

.github/workflows/build-opencv-wheel.yml

@@ -1,15 +1,95 @@
 name: Build OpenCV Python wheel
 
 on:
-  workflow_dispatch:
+  push:
+    tags:
+      - 'opencv/*'
 
 permissions:
-  contents: read
+  contents: write
 
 jobs:
-
-  placeholder:
+  build-wheels:
     runs-on: ubuntu-24.04-arm
+    container:
+      image: debian:trixie
+      options: --user root
+    timeout-minutes: 180
+
     steps:
-      - name: Stub build step
-        run: echo "Actual build steps are defined in another branch."
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install prerequisites
+        run: |
+          apt-get update
+          apt-get install -y --no-install-recommends gh git ca-certificates build-essential pkg-config ninja-build
+
+      - name: Install Python
+        run: |
+          apt-get install -y --no-install-recommends python3 python3-dev python3-pip
+
+      - name: Install FFmpeg dependencies
+        run: |
+          apt-get install -y --no-install-recommends libavcodec-dev libavformat-dev libavutil-dev libswscale-dev
+
+      - name: Install Media I/O dependencies
+        run: |
+          apt-get install -y --no-install-recommends libjpeg62-turbo-dev libpng-dev libtiff-dev libwebp-dev libopenblas-dev liblapacke-dev
+
+      - name: Install GStreamer dependencies
+        run: |
+          apt-get install -y --no-install-recommends libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+
+      - name: Clone opencv-python repo
+        run: |
+          git clone --depth 1 https://github.com/opencv/opencv-python.git
+          cd opencv-python
+          git fetch --depth 1 origin 4ddfc013fd1f13d9b9e379dbebf2cdbeb052e7f8
+          git checkout 4ddfc013fd1f13d9b9e379dbebf2cdbeb052e7f8
+          git submodule update --init --recursive --depth 1
+
+      - name: Build OpenCV Python wheels
+        run: |
+          cd opencv-python
+          export OPENCV_VERSION=4.13.0
+          export ENABLE_CONTRIB=0
+          export ENABLE_HEADLESS=1
+          export CMAKE_ARGS="-DWITH_GSTREAMER=ON -DWITH_FFMPEG=ON -DWITH_CAROTENE=ON -DWITH_LAPACK=ON -DBUILD_opencv_python3=ON -DWITH_AVIF=OFF -DWITH_GTK=OFF -DWITH_QT=OFF -DWITH_CUDA=OFF -DBUILD_opencv_java=OFF -DWITH_VTK=OFF -DBUILD_opencv_dnn=OFF -DBUILD_opencv_dnn_modern=OFF"
+          pip3 wheel . --verbose --no-deps
+
+      - name: Upload wheel files
+        uses: actions/upload-artifact@v4
+        with:
+          name: opencv-python-wheels
+          path: opencv-python/*.whl
+
+      - name: Determine version
+        id: version
+        run: |
+          # Extract version from tag (opencv/4.13.0 -> 4.13.0)
+          VERSION="${GITHUB_REF#refs/tags/opencv/}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Release version: $VERSION"
+
+      - name: Create or update release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |          
+          VERSION="${{ steps.version.outputs.version }}"
+          TAG="opencv/$VERSION"
+          REPO="${{ github.repository }}"
+          
+          # Delete release if it already exists
+          if gh release view "$TAG" --repo "$REPO" >/dev/null 2>&1; then
+            echo "Release $TAG already exists. Deleting..."
+            gh release delete "$TAG" --repo "$REPO" --yes
+          fi
+
+          # Create release
+          gh release create "$TAG" \
+            opencv-python/opencv_python_headless*.whl \
+            --repo "$REPO" \
+            --latest=false \
+            --title "opencv-python-headless $VERSION" \
+            --notes "OpenCV Python headless wheel version $VERSION optimized for ARM64 architecture with GStreamer and FFmpeg support."

.github/workflows/ci-checks.yml

@@ -9,27 +9,33 @@ permissions:
 jobs:
   ci-checks:
     runs-on: ubuntu-24.04-arm
+    container:
+      image: python:3.13-slim
+      options: --user root
     env:
-      PYTHON_VERSION: "3.13"
-      TASKFILE_VERSION: "v3.44.0"
-      TASKFILE_PATH: "/home/runner/go/bin"
+      TASKFILE_VERSION: 'v3.44.0'
+      TASKFILE_PATH: '/home/runner/go/bin'
     steps:
+      - name: Install git
+        run: |
+          apt-get update
+          apt-get install -y --no-install-recommends --no-install-suggests git ca-certificates curl
+          git config --global --add safe.directory '*'
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
       - name: Install dependencies
         run: |
+          set -e
           which task || curl -sSfL https://taskfile.dev/install.sh | sh -s -- -b ${{ env.TASKFILE_PATH }} ${{ env.TASKFILE_VERSION }}
           export PATH="${{ env.TASKFILE_PATH }}:$PATH"
+          export SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0
           task init:ci
 
       - name: Check code formatting
         run: |
+          set -e
           export PATH="${{ env.TASKFILE_PATH }}:$PATH"
           task fmt > /dev/null 2>&1
           if git diff --quiet; then
@@ -41,22 +47,19 @@ jobs:
 
       - name: Check linting
         run: |
+          set -e
           export PATH="${{ env.TASKFILE_PATH }}:$PATH"
-          task lint  > /dev/null 2>&1
+          task lint > /dev/null 2>&1
           if git diff --quiet; then
             echo "Code is properly linted."
           else
             echo "Please lint the code by running 'task lint'."
             exit 1
           fi
 
-      - name: Run tests
-        run: |
-          export PATH="${{ env.TASKFILE_PATH }}:$PATH"
-          task test
-
       - name: Check license headers and files
         run: |
+          set -e
           export PATH="${{ env.TASKFILE_PATH }}:$PATH"
           task license:headers > /dev/null 2>&1
           if git diff --quiet; then
@@ -65,3 +68,9 @@ jobs:
             echo "Please update license headers by running 'task license:headers'."
             exit 1
           fi
+
+      - name: Run tests
+        run: |
+          useradd -m testuser
+          chown -R testuser:testuser .
+          runuser -u testuser -- env PATH="${{ env.TASKFILE_PATH }}:$PATH" task test