aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorFeng Xiao <xiaofeng@google.com>2015-11-30 13:43:56 -0800
committerFeng Xiao <xiaofeng@google.com>2015-11-30 13:43:56 -0800
commit1a59a715dc5fa584340197aac0811ba3de9850b5 (patch)
tree054a47a347534b6bdb31dcf08b24f7cc07f5669e /.travis.yml
parentf4e4be638634b74cbc9be10150bd8bf7a6cb4e8d (diff)
parent7e31c4d930efa3f80d0f03c93e788ba73b847fd8 (diff)
downloadprotobuf-1a59a715dc5fa584340197aac0811ba3de9850b5.tar.gz
protobuf-1a59a715dc5fa584340197aac0811ba3de9850b5.tar.bz2
protobuf-1a59a715dc5fa584340197aac0811ba3de9850b5.zip
Merge pull request #998 from tswast/goexample
Add a Go language example.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 7be0d18e..7780174c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
- CONFIG=cpp
- CONFIG=cpp_distcheck
- CONFIG=csharp
+ - CONFIG=golang
- CONFIG=java_jdk6
- CONFIG=java_jdk7
- CONFIG=java_oracle7
@@ -48,6 +49,10 @@ matrix:
# which doesn't work on OS X.
- os: osx
env: CONFIG=csharp
+ # Requires installing golang, currently travis.sh is doing that with apt-get
+ # which doesn't work on OS X.
+ - os: osx
+ env: CONFIG=golang
# Add into the matrix OS X tests of Objective C (needs Xcode, so it won't
# work on other platforms). These are split so it doesn't take as long to run.
include: