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
100c85e5
Commit
100c85e5
authored
Jan 19, 2021
by
Isuru Fernando
Browse files
Use xcode12.2 image
parent
a0f2fd26
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
10 deletions
+2
-10
README.rst
README.rst
+2
-2
travis_osx_steps.sh
travis_osx_steps.sh
+0
-8
No files found.
README.rst
View file @
100c85e5
...
@@ -272,8 +272,8 @@ To use these scripts
...
@@ -272,8 +272,8 @@ To use these scripts
# and test containers, via docker.
# and test containers, via docker.
dist: xenial
dist: xenial
# osx image that enables Apple silicon
build
s
# osx image that enables
building
Apple silicon
librarie
s
osx_image: xcode12
u
osx_image: xcode12
.2
matrix:
matrix:
include:
include:
...
...
travis_osx_steps.sh
View file @
100c85e5
...
@@ -8,14 +8,6 @@ MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
...
@@ -8,14 +8,6 @@ MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
ENV_VARS_PATH
=
${
ENV_VARS_PATH
:-
env_vars
.sh
}
ENV_VARS_PATH
=
${
ENV_VARS_PATH
:-
env_vars
.sh
}
if
[
"
$PLAT
"
==
"universal2"
]
||
[
"
$PLAT
"
==
"arm64"
]
;
then
if
[
"
$TRAVIS
"
==
"true"
]
;
then
# Setup xcode and compilers to use the new SDK for universal2 and arm64 builds
sudo
xcode-select
-switch
/Applications/Xcode_12.2.app
export
SDKROOT
=
/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
fi
fi
# These load common_utils.sh
# These load common_utils.sh
source
$MULTIBUILD_DIR
/osx_utils.sh
source
$MULTIBUILD_DIR
/osx_utils.sh
MB_PYTHON_OSX_VER
=
${
MB_PYTHON_OSX_VER
:-
$(
macpython_sdk_for_version
$MB_PYTHON_VERSION
)
}
MB_PYTHON_OSX_VER
=
${
MB_PYTHON_OSX_VER
:-
$(
macpython_sdk_for_version
$MB_PYTHON_VERSION
)
}
...
...
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