aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorGravatar Jon Skeet <skeet@pobox.com>2016-07-14 22:01:47 +0100
committerGravatar GitHub <noreply@github.com>2016-07-14 22:01:47 +0100
commit10a8fb4e73b3dada58123aeabc393288ac791dc8 (patch)
tree54b058cfaff68b49a20aa8dfaec297faaddda109 /.travis.yml
parent042993b3dd8c52f979870c91ea7fcbcf0dcf94a0 (diff)
Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform (#1727)
Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform This also updates the version number to 3.0.0-beta4
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 7 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 46abbb9e..7cfe0dfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ script:
env:
- CONFIG=cpp
- CONFIG=cpp_distcheck
- - CONFIG=csharp
- CONFIG=golang
- CONFIG=java_jdk6
- CONFIG=java_jdk7
@@ -52,10 +51,6 @@ matrix:
env: CONFIG=javanano_jdk7
- os: osx
env: CONFIG=javanano_oracle7
- # Requires installing mono, currently travis.sh is doing that with apt-get
- # 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
@@ -70,6 +65,13 @@ matrix:
env: CONFIG=objectivec_osx
- os: linux
env: CONFIG=objectivec_cocoapods_integration
+ # The dotnet environment requires Ubuntu 14.04 or 16.04. This
+ # configuration is effectively an "extra" one, outside the
+ # autogenerated matrix.
+ include:
+ - os: linux
+ env: CONFIG=csharp
+ dist: trusty
allow_failures:
# These currently do not work on OS X but are being worked on by @haberman.
- os: osx