提交 2bab1f58 编写于 作者: A Andrey Senyaev

Split builds and tests for linux, update submodules only when a PR, turned off...

Split builds and tests for linux, update submodules only when a PR, turned off freetype because of issues, added get_build_info script
上级 6336ca86
......@@ -39,7 +39,7 @@ jobs:
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0}}
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
......@@ -47,19 +47,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true
submodules: false
fetch-depth: 0
- name: Update submodules
run: |
git submodule update --remote
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
if: ${{ 'macos-latest' == matrix.os }}
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.platform }}
if: github.event_name == 'pull_request'
run: git submodule update --remote
- name: Setup Environment variables
run: |
......@@ -71,7 +64,7 @@ jobs:
echo "BUILD_DEPENDS=$(echo $NP_BUILD_DEP)" >> $GITHUB_ENV;
echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV;
- name: before install
- name: build
run: |
set -e
# Check out and prepare the source
......@@ -88,6 +81,23 @@ jobs:
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
- 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
......@@ -129,9 +139,9 @@ jobs:
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0}}
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui || 0 }}
ENABLE_CONTRIB: ${{ matrix.with_contrib || 0}}
ENABLE_CONTRIB: ${{ matrix.with_contrib || 0 }}
steps:
- name: Checkout
......@@ -141,8 +151,8 @@ jobs:
fetch-depth: 0
- 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
......
......@@ -41,7 +41,7 @@ jobs:
DOCKER_TEST_IMAGE: multibuild/xenial_arm64v8
USE_CCACHE: 0
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0}}
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
......
......@@ -39,7 +39,7 @@ jobs:
DOCKER_IMAGE: quay.io/skvark/manylinux2014_${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0}}
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
......@@ -51,8 +51,8 @@ jobs:
fetch-depth: 0
- 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
......
......@@ -27,9 +27,10 @@ jobs:
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
SDIST: ${{ matrix.build_sdist || 0}}
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}\opencv_extra\testdata
steps:
- name: Checkout
......@@ -39,8 +40,8 @@ jobs:
fetch-depth: 0
- 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
......@@ -64,12 +65,13 @@ jobs:
cd ${{ github.workspace }}/tests
&python -m pip install --user --no-warn-script-location (ls "../wheelhouse/opencv*.whl")
if ($LastExitCode -ne 0) {throw $LastExitCode}
python get_build_info.py
shell: powershell
- name: run test
run: |
cd ${{ github.workspace }}/tests
python -m unittest test
cd ${{ github.workspace }}/opencv
python modules\python\test\test.py -v --repo .
shell: cmd
- name: saving artifacts
......
......@@ -145,6 +145,7 @@ def main():
"-DINSTALL_CREATE_DISTRIB=ON",
# See opencv/CMakeLists.txt for options and defaults
"-DBUILD_opencv_apps=OFF",
"-DBUILD_opencv_freetype=OFF",
"-DBUILD_SHARED_LIBS=OFF",
"-DBUILD_TESTS=OFF",
"-DBUILD_PERF_TESTS=OFF",
......
import cv2 as cv
print(cv.getBuildInformation())
......@@ -150,6 +150,10 @@ function run_tests {
if [ -n "$IS_OSX" ]; then
echo "Running for OS X"
cd ../tests
$PYTHON get_build_info.py
cd ../opencv/
export OPENCV_TEST_DATA_PATH=../opencv_extra/testdata
else
......@@ -158,6 +162,9 @@ function run_tests {
if [ $PYTHON == "python3.6" ]; then
$PYTHON -m pip install -U numpy==1.19.4
fi
cd /io/tests
$PYTHON get_build_info.py
cd /io/opencv
export OPENCV_TEST_DATA_PATH=/io/opencv_extra/testdata
fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册