Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
2a22a33b
Commit
2a22a33b
authored
Feb 12, 2019
by
Rob Buckley
Browse files
missing default caused osx TEST_BUILD=1 cases to fail
parent
8a05b2e6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
.travis.yml
.travis.yml
+3
-0
osx_utils.sh
osx_utils.sh
+5
-3
No files found.
.travis.yml
View file @
2a22a33b
...
...
@@ -53,6 +53,7 @@ matrix:
env
:
-
PYTHON_VERSION=2.7
-
MB_PYTHON_OSX_VER=10.9
-
TEST_BUILDS=1
-
os
:
osx
env
:
-
PYTHON_VERSION=3.4
...
...
@@ -128,11 +129,13 @@ matrix:
osx_image
:
xcode10.1
env
:
-
PYTHON_VERSION=3.7
-
TEST_BUILDS=1
-
os
:
osx
osx_image
:
xcode10.1
env
:
-
PYTHON_VERSION=3.7
-
MB_PYTHON_OSX_VER=10.9
-
TEST_BUILDS=1
-
os
:
osx
osx_image
:
xcode10
env
:
...
...
osx_utils.sh
View file @
2a22a33b
...
...
@@ -138,9 +138,11 @@ function mac_arch_for_pyosx_version {
# echo arch (intel or x86_64) that cpython builds targetted for the
# given minimum macOS are targetted for
# Parameters
# $py_osx_ver (major.minor} the macosx version that python is built
# for, e.g. "10.6" or "10.9"
py_osx_ver
=
$1
# $py_osx_ver (major.minor | not defined}
# if defined, the macosx version that python is built for, e.g.
# "10.6" or "10.9", if not defined, uses the default
# MACPYTHON_DEFAULT_OSX
py_osx_ver
=
${
1
:-
$MACPYTHON_DEFAULT_OSX
}
check_var
$py_osx_ver
if
[
$py_osx_ver
-eq
"10.6"
]
;
then
echo
"intel"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment