diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-03-30 10:51:26 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-03-30 10:51:26 -0700 |
| commit | 34d0cc220b88faf300036a41cb8bec2499c6339a (patch) | |
| tree | ab52fc3f92977c4b9bbfe07ce8ef88748f330e5e /.travis.yml | |
| parent | 261fde17072075eb69be1acdd58f4a97986465e0 (diff) | |
| parent | a15b916c419000565384a78224e402ed925e5fc8 (diff) | |
| download | protobuf-34d0cc220b88faf300036a41cb8bec2499c6339a.tar.gz protobuf-34d0cc220b88faf300036a41cb8bec2499c6339a.tar.bz2 protobuf-34d0cc220b88faf300036a41cb8bec2499c6339a.zip | |
Merge pull request #1295 from haberman/docker
Add support for running on Jenkins
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 60c0427d..bcf3851b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ os: # The Objective C build needs Xcode 7.0 or later. osx_image: xcode7.2 script: - - ./travis.sh $CONFIG + - ./tests.sh $CONFIG env: - CONFIG=cpp - CONFIG=cpp_distcheck |