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
73e8c8aa
Commit
73e8c8aa
authored
Nov 15, 2017
by
Thomas Van Lenten
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Instead of listing and then excluding osx builds, just don't list them.
parent
91ff83c0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
20 deletions
+4
-20
.travis.yml
.travis.yml
+4
-20
No files found.
.travis.yml
View file @
73e8c8aa
...
...
@@ -14,11 +14,10 @@ script:
env
:
-
CONFIG=cpp
-
CONFIG=cpp_distcheck
-
CONFIG=golang
-
CONFIG=java_jdk7
-
CONFIG=java_oracle7
-
CONFIG=javanano_jdk7
-
CONFIG=javanano_oracle7
# Testing go requires installing golang, currently travis.sh is doing that
# with apt-get which doesn't work on OS X.
# It's nontrivial to programmatically install a new JDK from the command
# line on OS X, so we rely on testing on Linux for Java code.
-
CONFIG=javascript
# iOS build log was starting to choke travis UI, so split to cover the
# Xcode Debug and Release Configurations independently.
...
...
@@ -34,21 +33,6 @@ env:
-
CONFIG=php5.6_mac
-
CONFIG=php7.0_mac
matrix
:
exclude
:
# It's nontrivial to programmatically install a new JDK from the command
# line on OS X, so we rely on testing on Linux for Java code.
-
os
:
osx
env
:
CONFIG=java_jdk7
-
os
:
osx
env
:
CONFIG=java_oracle7
-
os
:
osx
env
:
CONFIG=javanano_jdk7
-
os
:
osx
env
:
CONFIG=javanano_oracle7
# Requires installing golang, currently travis.sh is doing that with apt-get
# which doesn't work on OS X.
-
os
:
osx
env
:
CONFIG=golang
include
:
# The dotnet environment requires Ubuntu 14.04 or 16.04. This
# configuration is effectively an "extra" one, outside the
...
...
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