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
8417871a
Commit
8417871a
authored
Apr 20, 2018
by
Thomas Van Lenten
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to Xcode 9.3 which also means a High Sierra image.
parent
b59da6d0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
.travis.yml
.travis.yml
+4
-4
full_mac_build.sh
objectivec/DevTools/full_mac_build.sh
+13
-1
No files found.
.travis.yml
View file @
8417871a
...
...
@@ -14,21 +14,21 @@ matrix:
-
os
:
osx
env
:
CONFIG=objectivec_osx
osx_image
:
xcode9.
1
osx_image
:
xcode9.
3
language
:
objective-c
# iOS build log was starting to choke travis UI, so split to cover the
# Xcode Debug and Release Configurations independently.
-
os
:
osx
env
:
CONFIG=objectivec_ios_debug
osx_image
:
xcode9.
1
osx_image
:
xcode9.
3
language
:
objective-c
-
os
:
osx
env
:
CONFIG=objectivec_ios_release
osx_image
:
xcode9.
1
osx_image
:
xcode9.
3
language
:
objective-c
-
os
:
osx
env
:
CONFIG=objectivec_cocoapods_integration
osx_image
:
xcode9.
1
osx_image
:
xcode9.
3
language
:
objective-c
# -----------------------------------------------------------------
...
...
objectivec/DevTools/full_mac_build.sh
View file @
8417871a
...
...
@@ -269,8 +269,20 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-disable-concurrent-testing
)
;;
9.3
*
)
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
-destination
"platform=iOS Simulator,name=iPhone 7,OS=latest"
# 64bit
# 9.3 also seems to often fail running destinations in parallel
-disable-concurrent-testing
)
;;
*
)
echo
"Time to update the simulator targets for Xcode
${
XCODE_VERSION
}
"
echo
""
echo
"ATTENTION: Time to update the simulator targets for Xcode
${
XCODE_VERSION
}
"
echo
""
echo
"Build aborted!"
exit
2
;;
esac
...
...
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