8000 Gs/fix submodules checkout by sergregory · Pull Request #6 · sergregory/opencv-python · GitHub
[go: up one dir, main page]
Skip to content

Gs/fix submodules checkout #6

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Gs/fix submodules checkout #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3e517ca
3.4.x uses BSD
skvark Jan 3, 2021
fe3c2a1
update 3.4.x specific parts
skvark Jan 3, 2021
427f499
OpenCV 3.4.13
skvark Jan 3, 2021
6c9ce38
Update opencv 3.4.13 -> 3.4.14
sergregory May 1, 2021
5f52244
Merge branch 'master' into 3.4
8000 sergregory May 1, 2021
ff8fe35
Apply review comment - unify spaces inside the double brackets for va…
sergregory May 5, 2021
311e6ac
Merge pull request #476 from opencv/gs/update-3.4
asmorkalov May 5, 2021
23b92eb
Update years in opencv license according to the original repo (#477)
sergregory May 5, 2021
42ac3ea
Merge pull request #480 from opencv/master
sergregory May 6, 2021
b1050af
Added the arm build for 3.4 branch
May 12, 2021
1720df2
Split workflows according to platforms
May 18, 2021
ffc3f75
Defined 3.4 branch in .gitmodules and updated opencv_extra submodule
May 21, 2021
d58df65
Fixed submodules
May 24, 2021
63c5ea6
Fix typo in naming
May 24, 2021
8f5a34f
Split package building and testing steps to checkout all submodules n…
sergregory May 24, 2021
750a553
WIP: update target branch
sergregory May 24, 2021
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
8000
Prev Previous commit
Next Next commit
Fixed submodules
  • Loading branch information
Andrey Senyaev committed May 24, 2021
commit d58df653183f7145f74b42603ac3482479beb898
20 changes: 15 additions & 5 deletions .github/workflows/build_wheels_linux.yml
< 8000 svg aria-label="Show options" role="img" height="16" viewBox="0 0 16 16" version="1.1" width="16" data-view-component="true" class="octicon octicon-kebab-horizontal">
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Build PYPI wheels for opencv-python on Linux x86_64
name: Build PYPI wheels fgithub.event_name == 'release'or opencv-python on Linux x86_64

on:
push:
branches:
- asen/check_3.4_wo_submodules
pull_request:
branches:
- 3.4
Expand Down Expand Up @@ -47,12 +50,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true
submodules: false
fetch-depth: 0

- name: Update multibuild submodule
run: git submodule update --init --recursive multibuild

- name: Update submodules
run: |
git submodule update --remote
if: github.event_name == 'pull_request'
run: git submodule update --remote

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
Expand Down Expand Up @@ -137,10 +143,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true
submodules: false
fetch-depth: 0

- name: Update multibuild submodule
run: git submodule update --init --recursive multibuild

- name: Update submodules
if: github.event_name == 'pull_request'
run: |
git submodule update --remote

Expand Down
12 changes: 11 additions & 1 deletion .github/workflows/build_wheels_linux_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Build PYPI wheels for opencv-python on Linux ARM

on:
push:
branches:
- asen/check_3.4_wo_submodules
pull_request:
branches:
- 3.4
Expand Down Expa 8000 nd Up @@ -53,9 +56,16 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true
submodules: false
fetch-depth: 0

- name: Update multibuild submodule
run: git submodule update --init --recursive multibuild

- name: Update submodules
if: github.event_name == 'pull_request'
run: git submodule update --remote

- name: Setup Environment variables
run: |
if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/build_wheels_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Build PYPI wheels for opencv-python on Macos

on:
push:
branches:
- asen/check_3.4_wo_submodules
pull_request:
branches:
- 3.4
Expand Down Expand Up @@ -47,12 +50,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true
submodules: false
fetch-depth: 0

- name: Update multibuild submodule
run: git submodule update --init --recursive multibuild

- name: Update submodules
run: |
git submodule update --remote
if: github.event_name == 'pull_request'
run: git submodule update --remote

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/build_wheels_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Build PYPI wheels for opencv-python on Windows

on:
push:
branches:
- asen/check_3.4_wo_submodules
pull_request:
branches:
- 3.4
Expand Down Expand Up @@ -35,12 +38,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true
submodules: false
fetch-depth: 0

- name: Update multibuild submodule
run: git submodule update --init --recursive multibuild

- name: Update submodules
run: |
git submodule update --remote
if: github.event_name == 'pull_request'
run: git submodule update --remote

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
Expand Down
0