Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
d52f2bb9
Commit
d52f2bb9
authored
Nov 01, 2018
by
Thomas Van Lenten
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add more Xcode versions to the objc build script.
parent
18aa2961
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
full_mac_build.sh
objectivec/DevTools/full_mac_build.sh
+14
-2
No files found.
objectivec/DevTools/full_mac_build.sh
View file @
d52f2bb9
...
...
@@ -268,7 +268,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-disable-concurrent-testing
)
;;
9.
3
*
)
9.
[3-4]
*
)
XCODEBUILD_TEST_BASE_IOS+
=(
# Xcode 9.3 chokes targeting iOS 8.x - http://www.openradar.me/39335367
-destination
"platform=iOS Simulator,name=iPhone 4s,OS=9.0"
# 32bit
...
...
@@ -277,11 +277,20 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-disable-concurrent-testing
)
;;
10.[0-1]
*
)
XCODEBUILD_TEST_BASE_IOS+
=(
-destination
"platform=iOS Simulator,name=iPhone 4s,OS=8.1"
# 32bit
-destination
"platform=iOS Simulator,name=iPhone 7,OS=latest"
# 64bit
# 10.x also seems to often fail running destinations in parallel (with
# 32bit one include atleast)
-disable-concurrent-destination-testing
)
;;
*
)
echo
""
echo
"ATTENTION: Time to update the simulator targets for Xcode
${
XCODE_VERSION
}
"
echo
""
echo
"Build aborted!"
echo
"
ERROR:
Build aborted!"
exit
2
;;
esac
...
...
@@ -334,3 +343,6 @@ if [[ "${DO_OBJC_CONFORMANCE_TESTS}" == "yes" ]] ; then
wrapped_make
-j
"
${
NUM_MAKE_JOBS
}
"
test_objc
cd
..
fi
echo
""
echo
"
$(
basename
"
${
0
}
"
)
: Success!"
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