Skip to content

Commit 08b0eb3

Browse files
committed
Drop dedicated pipeline for Mac ARM, use matrix build.
1 parent 597ce8e commit 08b0eb3

2 files changed

Lines changed: 9 additions & 202 deletions

File tree

.github/workflows/build_wheels_macos.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: macOS x86_64
1+
name: MacOS
22

33
on:
44
pull_request:
@@ -8,7 +8,6 @@ on:
88
paths-ignore:
99
- '.github/workflows/build_wheels_manylinux*'
1010
- '.github/workflows/build_wheels_windows*'
11-
- '.github/workflows/build_wheels_macos_m1.yml'
1211
release:
1312
types: [published, edited]
1413
schedule:
@@ -18,12 +17,12 @@ on:
1817

1918
jobs:
2019
Build:
21-
runs-on: macos-15-intel
20+
runs-on: ${{ matrix.platform == 'arm64' && 'macos-15' || 'macos-15-intel' }}
2221
strategy:
2322
fail-fast: false
2423
matrix:
2524
python-version: ['3.10']
26-
platform: [x64]
25+
platform: [x86_64, arm64]
2726
with_contrib: [0, 1]
2827
without_gui: [0, 1]
2928
build_sdist: [0]
@@ -40,7 +39,7 @@ jobs:
4039
CONFIG_PATH: travis_config.sh
4140
USE_CCACHE: 1
4241
UNICODE_WIDTH: 32
43-
PLAT: x86_64
42+
PLAT: ${{ matrix.platform }}
4443
SDIST: ${{ matrix.build_sdist || 0 }}
4544
ENABLE_HEADLESS: ${{ matrix.without_gui }}
4645
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
@@ -75,25 +74,25 @@ jobs:
7574
- name: Saving a wheel accordingly to matrix
7675
uses: actions/upload-artifact@v7
7776
with:
78-
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
77+
name: wheel-${{ matrix.platform }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
7978
path: wheelhouse/opencv*.whl
8079

8180
Test:
8281
needs: [Build]
83-
runs-on: macos-15-intel
82+
runs-on: ${{ matrix.platform == 'arm64' && 'macos-15' || 'macos-15-intel' }}
8483
strategy:
8584
fail-fast: false
8685
matrix:
8786
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
88-
platform: [x64]
87+
platform: [x86_64, arm64]
8988
with_contrib: [0, 1]
9089
without_gui: [0, 1]
9190
build_sdist: [0]
9291
env:
9392
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
9493
MB_PYTHON_VERSION: ${{ matrix.python-version }}
9594
CONFIG_PATH: travis_config.sh
96-
PLAT: x86_64
95+
PLAT: ${{ matrix.platform }}
9796
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
9897
PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py
9998
PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple
@@ -112,7 +111,7 @@ jobs:
112111
- name: Download a wheel accordingly to matrix
113112
uses: actions/download-artifact@v8
114113
with:
115-
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
114+
name: wheel-${{ matrix.platform }}-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
116115
path: wheelhouse/
117116
- name: Create Venv for test
118117
run: |

.github/workflows/build_wheels_macos_m1.yml

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)