Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

5.x merge 4.x and submodules update#1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
asmorkalov merged 15 commits intoopencv:4.xfromasmorkalov:5.x-merge-4.x
Dec 3, 2024
Merged
Changes from1 commit
Commits
Show all changes
15 commits
Select commitHold shift + click to select a range
7b10157
Updated submodules to the latest in 5.x (#696)
asenyaevJul 29, 2022
3336f67
Run pipelines on 4.x and 5.x branches (#697)
asenyaevAug 1, 2022
5aad8e1
Fix path to opencv 5.x for haarcascades
asenyaevAug 1, 2022
230bdff
Merge pull request #698 from asenyaev/asen/5.x_pipelines
asmorkalovAug 1, 2022
3d0b585
Scheduled rolling workflows (#699)
asenyaevAug 3, 2022
f9c4021
macOS x86_64 runner change to macos-11 (#701)
asenyaevAug 5, 2022
27cca18
Merge pull request #705 from asenyaev/asen/update_5.x
asmorkalovAug 11, 2022
710c89e
Adapted rolling releases to workflow_dispatch event (#709)
asenyaevAug 21, 2022
c9a96a6
Defined 5.x branch for submodules (#710)
asenyaevAug 21, 2022
ebd7b5a
Remove source packages for rolling packages (#712)
asenyaevAug 22, 2022
ec5c8b5
Build zlib from the source on Linux with the latest version (#715) (#…
asenyaevAug 29, 2022
66bbd9d
Build x64 macOS wheels for 10.13 build target (#716)
joeyballentineAug 29, 2022
b0b7f9f
Bump numpy version to 1.21.4 for macOS builds (#720)
asenyaevAug 29, 2022
8a47bfa
Merge pull request #722 from asenyaev/asen/update_5.x_with_4.x
asenyaevAug 31, 2022
2d2d5ae
Merge branch '4.x' into 5.x-merge-4.x
asmorkalovNov 28, 2024
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
PrevPrevious commit
NextNext commit
macOS x86_64 runner change to macos-11 (#701)
  • Loading branch information
@asenyaev
asenyaev committedAug 5, 2022
commitf9c40212eb060f5b56a7545b2dbaea2fa62a94b3
29 changes: 3 additions & 26 deletions.github/workflows/build_wheels_macos.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,30 +20,18 @@ on:

jobs:
Build:
runs-on:${{ matrix.os }}
runs-on:macos-11
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
os: [macos-10.15, macos-11]
python-version: ['3.6']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
build_sdist: [0]
exclude:
- os: macos-10.15
python-version: '3.10'
- os: macos-11
python-version: '3.6'
- os: macos-11
python-version: '3.7'
- os: macos-11
python-version: '3.8'
- os: macos-11
python-version: '3.9'
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
REPO_DIR: .
Expand All@@ -62,6 +50,7 @@ jobs:
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
MACOSX_DEPLOYMENT_TARGET: 10.15
steps:
- name: Cleanup
run: find . -mindepth 1 -delete
Expand DownExpand Up@@ -108,30 +97,18 @@ jobs:

Test:
needs: [Build]
runs-on:${{ matrix.os }}
runs-on:macos-11
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
os: [macos-10.15, macos-11]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
build_sdist: [0]
exclude:
- os: macos-10.15
python-version: '3.10'
- os: macos-11
python-version: '3.6'
- os: macos-11
python-version: '3.7'
- os: macos-11
python-version: '3.8'
- os: macos-11
python-version: '3.9'
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
MB_PYTHON_VERSION: ${{ matrix.python-version }}
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp