Merge remote-tracking branch 'upstream/4.x' into single-ci-workflow

Author: EpicWink

.github/workflows/build_wheels_macos.yml

@@ -1,4 +1,4 @@
-name: macOS x86_64
+name: MacOS
 
 on:
   pull_request:
@@ -8,7 +8,6 @@ on:
     paths-ignore:
       - '.github/workflows/build_wheels_manylinux*'
       - '.github/workflows/build_wheels_windows*'
-      - '.github/workflows/build_wheels_macos_m1.yml'
   workflow_call:
     inputs:
       enable-rolling:
@@ -18,12 +17,12 @@ on:
 
 jobs:
   Build:
-    runs-on: macos-15-intel
+    runs-on: ${{ matrix.platform == 'arm64' && 'macos-15' || 'macos-15-intel' }}
     strategy:
       fail-fast: false
       matrix:
         python-version: ['3.10']
-        platform: [x64]
+        platform: [x86_64, arm64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
         build_sdist: [0]
@@ -40,7 +39,7 @@ jobs:
       CONFIG_PATH: travis_config.sh
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
-      PLAT: x86_64
+      PLAT: ${{ matrix.platform }}
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
@@ -75,25 +74,25 @@ jobs:
     - name: Saving a wheel accordingly to matrix
       uses: actions/upload-artifact@v7
       with:
-        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+        name: wheel-${{ matrix.platform }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/opencv*.whl
 
   Test:
     needs: [Build]
-    runs-on: macos-15-intel
+    runs-on: ${{ matrix.platform == 'arm64' && 'macos-15' || 'macos-15-intel' }}
     strategy:
       fail-fast: false
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
-        platform: [x64]
+        platform: [x86_64, arm64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
         build_sdist: [0]
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       CONFIG_PATH: travis_config.sh
-      PLAT: x86_64
+      PLAT: ${{ matrix.platform }}
       OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
       PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py
       PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple
@@ -112,7 +111,7 @@ jobs:
     - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v8
       with:
-        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+        name: wheel-${{ matrix.platform }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
     - name: Create Venv for test
       run: |

.github/workflows/build_wheels_macos_m1.yml

@@ -19,19 +19,14 @@ jobs:
     with:
       enable-rolling: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
 
-  Build-macosm1:
-    uses: $/.github/workflows/build_wheels_macos_m1.yml # includes testing
-    with:
-      enable-rolling: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-
   Build-macos:
     uses: $/.github/workflows/build_wheels_macos.yml # includes testing
     with:
       enable-rolling: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
 
   Release_rolling:
     if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-    needs: [Build-manylinux, Build-windows, Build-macosm1, Build-macos]
+    needs: [Build-manylinux, Build-windows, Build-macos]
     runs-on: ubuntu-22.04
     environment: opencv-python-rolling-release
     defaults:
@@ -60,7 +55,7 @@ jobs:
 
   Pre-release:
     if: github.event_name == 'release' && github.event.release.prerelease
-    needs: [Build-manylinux, Build-windows, Build-macosm1, Build-macos]
+    needs: [Build-manylinux, Build-windows, Build-macos]
     runs-on: ubuntu-22.04
     environment: test-opencv-python-release
     defaults:
@@ -78,7 +73,7 @@ jobs:
 
   Release:
     if: github.event_name == 'release' && !github.event.release.prerelease
-    needs: [Build-manylinux, Build-windows, Build-macosm1, Build-macos]
+    needs: [Build-manylinux, Build-windows, Build-macos]
     runs-on: ubuntu-22.04
     environment: opencv-python-release
     defaults: