Skip to content

Commit 597ce8e

Browse files
authored
Migrate Mac Intel builds to cloud. (#1270)
1 parent 72c1f44 commit 597ce8e

1 file changed

Lines changed: 21 additions & 15 deletions

File tree

‎.github/workflows/build_wheels_macos.yml‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ on:
1818

1919
jobs:
2020
Build:
21-
runs-on: python-macos-intel
21+
runs-on: macos-15-intel
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
python-version: ['3.9']
25+
python-version: ['3.10']
2626
platform: [x64]
2727
with_contrib: [0, 1]
2828
without_gui: [0, 1]
@@ -46,6 +46,9 @@ jobs:
4646
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
4747
PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple
4848
steps:
49+
- uses: actions/setup-python@v7
50+
with:
51+
python-version: ${{ matrix.python-version }}
4952
- name: Cleanup
5053
run: find . -mindepth 1 -delete
5154
working-directory: ${{ github.workspace }}
@@ -65,8 +68,9 @@ jobs:
6568
echo $ENABLE_CONTRIB > contrib.enabled
6669
echo $ENABLE_HEADLESS > headless.enabled
6770
export MACOSX_DEPLOYMENT_TARGET=14.0
68-
python${{ matrix.python-version }} -m pip install toml && python${{ matrix.python-version }} -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python${{ matrix.python-version }} -m pip install -r /dev/stdin
69-
python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
71+
python --version
72+
python -m pip install delocate toml && python -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python -m pip install -r /dev/stdin
73+
python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
7074
delocate-wheel ${{ github.workspace }}/wheelhouse/opencv*
7175
- name: Saving a wheel accordingly to matrix
7276
uses: actions/upload-artifact@v7
@@ -76,26 +80,27 @@ jobs:
7680

7781
Test:
7882
needs: [Build]
79-
runs-on: python-macos-intel
83+
runs-on: macos-15-intel
8084
strategy:
8185
fail-fast: false
8286
matrix:
83-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
87+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
8488
platform: [x64]
8589
with_contrib: [0, 1]
8690
without_gui: [0, 1]
8791
build_sdist: [0]
8892
env:
8993
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
9094
MB_PYTHON_VERSION: ${{ matrix.python-version }}
91-
NP_TEST_DEP: numpy==1.19.4
92-
NP_TEST_DEP_LATEST: numpy==2.2.6
9395
CONFIG_PATH: travis_config.sh
9496
PLAT: x86_64
9597
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
9698
PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py
9799
PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple
98100
steps:
101+
- uses: actions/setup-python@v7
102+
with:
103+
python-version: ${{ matrix.python-version }}
99104
- name: Cleanup
100105
run: find . -mindepth 1 -delete
101106
working-directory: ${{ github.workspace }}
@@ -112,25 +117,26 @@ jobs:
112117
- name: Create Venv for test
113118
run: |
114119
test -d "${{ github.workspace }}/opencv_test" && rm -rf "${{ github.workspace }}/opencv_test"
115-
python${{ matrix.python-version }} -m venv ${{ github.workspace }}/opencv_test
120+
python -m venv ${{ github.workspace }}/opencv_test
116121
- name: Package installation
117122
run: |
118123
source ${{ github.workspace }}/opencv_test/bin/activate
119-
python${{ matrix.python-version }} -m pip install --upgrade pip
120-
python${{ matrix.python-version }} -m pip install --no-cache --force-reinstall wheelhouse/opencv*.whl
124+
python --version
125+
python -m pip install --upgrade pip
126+
python -m pip install --no-cache --force-reinstall wheelhouse/opencv*.whl
121127
cd ${{ github.workspace }}/tests
122-
python${{ matrix.python-version }} get_build_info.py
128+
python get_build_info.py
123129
- name: Run tests
124130
run: |
125131
source ${{ github.workspace }}/opencv_test/bin/activate
126132
cd ${{ github.workspace }}/opencv
127-
python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
133+
python modules/python/test/test.py -v --repo .
128134
- name: Pylint test
129135
run: |
130136
source ${{ github.workspace }}/opencv_test/bin/activate
131-
python${{ matrix.python-version }} -m pip install pylint==2.15.9
137+
python -m pip install pylint==2.15.9
132138
cd ${{ github.workspace }}/tests
133-
python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE
139+
python -m pylint $PYLINT_TEST_FILE
134140
135141
Release_rolling:
136142
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}

0 commit comments

Comments
 (0)