Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Richard 祝发兴 - -IT
opencv-python
提交
83deed81
O
opencv-python
项目概览
Richard 祝发兴 - -IT
/
opencv-python
与 Fork 源项目一致
Fork自
OpenCV / opencv-python
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
83deed81
编写于
6月 03, 2021
作者:
A
Andrey Senyaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extracted build and install+test steps into two different scripts and fixed issues
上级
2bab1f58
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
52 addition
and
88 deletion
+52
-88
.github/workflows/build_wheels_linux.yml
.github/workflows/build_wheels_linux.yml
+5
-39
.github/workflows/build_wheels_linux_arm.yml
.github/workflows/build_wheels_linux_arm.yml
+7
-46
.github/workflows/build_wheels_macos.yml
.github/workflows/build_wheels_macos.yml
+3
-2
.github/workflows/build_wheels_windows.yml
.github/workflows/build_wheels_windows.yml
+2
-1
scripts/build.sh
scripts/build.sh
+17
-0
scripts/install.sh
scripts/install.sh
+18
-0
未找到文件。
.github/workflows/build_wheels_linux.yml
浏览文件 @
83deed81
...
...
@@ -33,7 +33,7 @@ jobs:
MB_PYTHON_VERSION
:
${{ matrix.python-version }}
TRAVIS_PYTHON_VERSION
:
${{ matrix.python-version }}
MB_ML_VER
:
2014
NP_TEST_DEP
:
numpy
NP_TEST_DEP
:
numpy
==1.19.4
TRAVIS_BUILD_DIR
:
${{ github.workspace }}
CONFIG_PATH
:
travis_config.sh
DOCKER_IMAGE
:
quay.io/skvark/manylinux2014_${PLAT}
...
...
@@ -56,50 +56,17 @@ jobs:
-
name
:
Setup Environment variables
run
:
|
if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
-
name
:
build
run
:
|
set -e
# Check out and prepare the source
# Multibuild doesn't have releases, so --depth would break eventually (see
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
git submodule update --init multibuild
source multibuild/common_utils.sh
# https://github.com/matthew-brett/multibuild/issues/116
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
source multibuild/travis_steps.sh
# This sets -x
# source travis_multibuild_customize.sh
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
run
:
source scripts/build.sh
-
name
:
install and test
run
:
|
set -e
# Check out and prepare the source
# Multibuild doesn't have releases, so --depth would break eventually (see
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
git submodule update --init --recursive
source multibuild/common_utils.sh
# https://github.com/matthew-brett/multibuild/issues/116
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
source multibuild/travis_steps.sh
# This sets -x
# source travis_multibuild_customize.sh
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
install_run $PLAT
set +x
run
:
source scripts/install.sh
-
name
:
saving artifacts
uses
:
actions/upload-artifact@v2
...
...
@@ -133,7 +100,7 @@ jobs:
MB_PYTHON_VERSION
:
${{ matrix.python-version }}
TRAVIS_PYTHON_VERSION
:
${{ matrix.python-version }}
MB_ML_VER
:
2014
NP_TEST_DEP
:
numpy
NP_TEST_DEP
:
numpy
==1.19.4
TRAVIS_BUILD_DIR
:
${{ github.workspace }}
CONFIG_PATH
:
travis_config.sh
DOCKER_IMAGE
:
quay.io/skvark/manylinux2014_${PLAT}
...
...
@@ -147,7 +114,7 @@ jobs:
-
name
:
Checkout
uses
:
actions/checkout@v2
with
:
submodules
:
tru
e
submodules
:
fals
e
fetch-depth
:
0
-
name
:
Update submodules
...
...
@@ -162,7 +129,6 @@ jobs:
-
name
:
Setup Environment variables
run
:
|
if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
...
...
.github/workflows/build_wheels_linux_arm.yml
浏览文件 @
83deed81
...
...
@@ -34,7 +34,7 @@ jobs:
TRAVIS_PYTHON_VERSION
:
${{ matrix.python-version }}
PLAT
:
aarch64
MB_ML_VER
:
2014
NP_TEST_DEP
:
numpy
NP_TEST_DEP
:
numpy
==1.19.4
TRAVIS_BUILD_DIR
:
${{ github.workspace }}
CONFIG_PATH
:
travis_config.sh
DOCKER_IMAGE
:
quay.io/skvark/manylinux2014_${PLAT}
...
...
@@ -53,7 +53,7 @@ jobs:
-
name
:
Checkout
uses
:
actions/checkout@v2
with
:
submodules
:
tru
e
submodules
:
fals
e
fetch-depth
:
0
-
name
:
Setup Environment variables
...
...
@@ -62,50 +62,11 @@ jobs:
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
-
name
:
before install
run
:
|
set -e
if [[ $SDIST == 0 ]]; then
# Check out and prepare the source
# Multibuild doesn't have releases, so --depth would break eventually (see
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
git submodule update --init multibuild
source multibuild/common_utils.sh
# https://github.com/matthew-brett/multibuild/issues/116
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
source multibuild/travis_steps.sh
# This sets -x
# source travis_multibuild_customize.sh
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
echo "end"
# Not interested in travis internal scripts' output
fi
set +x
# Build and package
set -x
ls
if [[ $SDIST == 1 ]]; then
python -m pip install --upgrade pip
python -m pip install scikit-build
python setup.py sdist
else
build_wheel $REPO_DIR $PLAT
fi
set +x
# Install and run tests
set -x
if [[ $SDIST == 1 ]]; then
echo "skipping tests because of sdist"
rc=0
else
install_run $PLAT && rc=$? || rc=$?
fi
set +x
#otherwise, Travis logic terminates prematurely
#https://travis-ci.community/t/shell-session-update-command-not-found-in-build-log-causes-build-to-fail-if-trap-err-is-set/817
trap ERR
test "$rc" -eq 0
-
name
:
build
run
:
source scripts/build.sh
-
name
:
install and test
run
:
source scripts/install.sh
-
name
:
saving artifacts
uses
:
actions/upload-artifact@v2
...
...
.github/workflows/build_wheels_macos.yml
浏览文件 @
83deed81
...
...
@@ -33,7 +33,7 @@ jobs:
MB_PYTHON_VERSION
:
${{ matrix.python-version }}
TRAVIS_PYTHON_VERSION
:
${{ matrix.python-version }}
MB_ML_VER
:
2014
NP_TEST_DEP
:
numpy
NP_TEST_DEP
:
numpy
==1.19.4
TRAVIS_BUILD_DIR
:
${{ github.workspace }}
CONFIG_PATH
:
travis_config.sh
DOCKER_IMAGE
:
quay.io/skvark/manylinux2014_${PLAT}
...
...
@@ -47,7 +47,7 @@ jobs:
-
name
:
Checkout
uses
:
actions/checkout@v2
with
:
submodules
:
tru
e
submodules
:
fals
e
fetch-depth
:
0
-
name
:
Update submodules
...
...
@@ -88,6 +88,7 @@ jobs:
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
git submodule update --init --recursive
install_run $PLAT
set +x
...
...
.github/workflows/build_wheels_windows.yml
浏览文件 @
83deed81
...
...
@@ -36,7 +36,7 @@ jobs:
-
name
:
Checkout
uses
:
actions/checkout@v2
with
:
submodules
:
tru
e
submodules
:
fals
e
fetch-depth
:
0
-
name
:
Update submodules
...
...
@@ -62,6 +62,7 @@ jobs:
-
name
:
before test
run
:
|
git submodule update --init --recursive
cd ${{ github.workspace }}/tests
&python -m pip install --user --no-warn-script-location (ls "../wheelhouse/opencv*.whl")
if ($LastExitCode -ne 0) {throw $LastExitCode}
...
...
scripts/build.sh
0 → 100755
浏览文件 @
83deed81
#!/bin/bash
set
-e
# Check out and prepare the source
# Multibuild doesn't have releases, so --depth would break eventually (see
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
git submodule update
--init
multibuild
source
multibuild/common_utils.sh
# https://github.com/matthew-brett/multibuild/issues/116
if
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
export
ARCH_FLAGS
=
" "
;
fi
source
multibuild/travis_steps.sh
# This sets -x
# source travis_multibuild_customize.sh
echo
$ENABLE_CONTRIB
>
contrib.enabled
echo
$ENABLE_HEADLESS
>
headless.enabled
set
-x
build_wheel
$REPO_DIR
$PLAT
scripts/install.sh
0 → 100755
浏览文件 @
83deed81
#!/bin/bash
set
-e
# Check out and prepare the source
# Multibuild doesn't have releases, so --depth would break eventually (see
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
git submodule update
--init
--recursive
source
multibuild/common_utils.sh
# https://github.com/matthew-brett/multibuild/issues/116
if
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
export
ARCH_FLAGS
=
" "
;
fi
source
multibuild/travis_steps.sh
# This sets -x
# source travis_multibuild_customize.sh
echo
$ENABLE_CONTRIB
>
contrib.enabled
echo
$ENABLE_HEADLESS
>
headless.enabled
set
-x
install_run
$PLAT
set
+x
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录