Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/build_wheels_macos.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS x86_64
name: MacOS

on:
pull_request:
Expand All @@ -8,7 +8,6 @@ on:
paths-ignore:
- '.github/workflows/build_wheels_manylinux*'
- '.github/workflows/build_wheels_windows*'
- '.github/workflows/build_wheels_macos_m1.yml'
release:
types: [published, edited]
schedule:
Expand All @@ -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]
Expand All @@ -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 }}
Expand Down Expand Up @@ -80,20 +79,20 @@ jobs:

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
Expand Down
192 changes: 0 additions & 192 deletions .github/workflows/build_wheels_macos_m1.yml

This file was deleted.

Loading