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
65672577
Unverified
Commit
65672577
authored
Feb 15, 2021
by
Matthew Brett
Committed by
GitHub
Feb 15, 2021
Browse files
Merge pull request #388 from isuruf/sdk
Select the correct SDK for github CI and azure pipelines
parents
63c1418e
4ce0414c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
travis_osx_steps.sh
travis_osx_steps.sh
+14
-0
travis_steps.sh
travis_steps.sh
+1
-1
No files found.
travis_osx_steps.sh
View file @
65672577
...
@@ -2,6 +2,20 @@
...
@@ -2,6 +2,20 @@
# Wheel build, install, run test steps on OSX
# Wheel build, install, run test steps on OSX
set
-e
set
-e
if
[
"
$PLAT
"
==
"arm64"
]
||
[
"
$PLAT
"
==
"universal2"
]
;
then
if
[[
"
$(
xcrun
-show-sdk-version
)
"
==
10.
*
]]
;
then
latestXcode
=
$(
ls
/Applications |
grep
Xcode[_0-9
\.
]
*
\.
app |
sort
-V
|
tail
-n
1
)
if
([
"
$GITHUB_WORKFLOW
"
!=
""
]
||
[
"
$PIPELINE_WORKSPACE
"
!=
""
])
&&
[
$latestXcode
]
;
then
sudo
xcode-select
-switch
/Applications/
$latestXcode
.app
fi
if
[[
"
$(
xcrun
-show-sdk-version
)
"
==
10.
*
]]
;
then
echo
"Need SDK>=11 for arm64 builds. Please run xcode-select to select a newer SDK"
exit
1
fi
fi
export
SDKROOT
=
${
SDKROOT
:-
$(
xcrun
-show-sdk-path
)
}
fi
# Get needed utilities
# Get needed utilities
MULTIBUILD_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
MULTIBUILD_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
MB_PYTHON_VERSION
=
${
MB_PYTHON_VERSION
:-
$TRAVIS_PYTHON_VERSION
}
MB_PYTHON_VERSION
=
${
MB_PYTHON_VERSION
:-
$TRAVIS_PYTHON_VERSION
}
...
...
travis_steps.sh
View file @
65672577
...
@@ -5,7 +5,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
...
@@ -5,7 +5,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
MULTIBUILD_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
MULTIBUILD_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
if
[
!
-d
"
$PWD
/
$WHEEL_SDIR
"
]
;
then
mkdir
$PWD
/
$WHEEL_SDIR
;
fi
if
[
!
-d
"
$PWD
/
$WHEEL_SDIR
"
]
;
then
mkdir
$PWD
/
$WHEEL_SDIR
;
fi
if
[[
"
$
TRAVIS_OS_NAME
"
==
"osx
"
]]
;
then
if
[[
"
$
(
uname
)
"
==
"Darwin
"
]]
;
then
source
$MULTIBUILD_DIR
/travis_osx_steps.sh
source
$MULTIBUILD_DIR
/travis_osx_steps.sh
else
else
source
$MULTIBUILD_DIR
/travis_linux_steps.sh
source
$MULTIBUILD_DIR
/travis_linux_steps.sh
...
...
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