8000 Rework Mac OS build by GArik · Pull Request #1 · GArik/opencv-python · GitHub
[go: up one dir, main page]
Skip to content

Rework Mac OS build #1

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 7 commits into
base: main
Choose a base branch
from
Open

Rework Mac OS build #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9bf025
Restore set +e; dropped with `before_cache` step
GArik Jan 14, 2021
964ef12
Use MacOS 10.15.5 for build
GArik Dec 8, 2020
673effc
Update multibuild submodule to the latest version
GArik Jan 22, 2021
3826d25
Rework Mac OS build
GArik Dec 30, 2020
6b9eb0f
Implement build timeouts
GArik Jan 19, 2021
3359907
Fix incorrect paths for delocate
GArik Jan 26, 2021
ad06688
Test deployment to PyPI
GArik Jan 26, 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
Prev Previous commit
Next Next commit
Update multibuild submodule to the latest version
  • Loading branch information
@GArik
GArik committed Jan 22, 2021
commit 673effc2828070e84d4a5a4658184facc7b4fa75
2 changes: 1 addition & 1 deletion multibuild
Open in desktop
Submodule multibuild updated 9 files
+1 −0 .travis.yml
+1 −1 LICENSE
+5 −2 README.rst
+4 −4 common_utils.sh
+3 −3 configure_build.sh
+12 −12 library_builders.sh
+3 −3 osx_utils.sh
+4 −4 tests/test_library_builders.sh
+2 −2 tests/test_multibuild.sh
10 changes: 5 additions & 5 deletions travis_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function bdist_wheel_cmd {
local abs_wheelhouse=$1
CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
cp dist/*.whl $abs_wheelhouse
if [ -z "$IS_OSX" ]; then
if [ -z "$IS_MACOS" ]; then
TOOLS_PATH=/opt/_internal/tools
/opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
source $TOOLS_PATH/bin/activate
Expand All @@ -26,7 +26,7 @@ function bdist_wheel_cmd {
if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
}

if [ -n "$IS_OSX" ]; then
if [ -n "$IS_MACOS" ]; then
echo " > OSX environment "
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
else
Expand All @@ -35,7 +35,7 @@ else
export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
fi

if [ -n "$IS_OSX" ]; then
if [ -n "$IS_MACOS" ]; then

source travis_osx_brew_cache.sh

Expand Down Expand Up @@ -92,7 +92,7 @@ function pre_build {
echo "Starting pre-build"
set -e -o pipefail

if [ -n "$IS_OSX" ]; then
if [ -n "$IS_MACOS" ]; then
echo "Running for OSX"

local CACHE_STAGE; (echo "$TRAVIS_BUILD_STAGE_NAME" | grep -qiF "final") || CACHE_STAGE=1
Expand Down Expand Up @@ -136,7 +136,7 @@ function run_tests {
echo "Run tests..."
echo $PWD

if [ -n "$IS_OSX" ]; then
if [ -n "$IS_MACOS" ]; then
echo "Running for OS X"
cd ../tests/
else
Expand Down
0