summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-02-08 22:08:27 +0100
committerJose <jose@zeroc.com>2018-02-08 22:08:27 +0100
commit3ef93324318ccddaee2b8b88603a2b51f6d356a3 (patch)
treed60226a7834dc6252931f45bb0ce9b6fba78d337
parentOnly restore zeroc.ice.net when building with binary dist (diff)
parentAdd csharp testing to Travis CI (diff)
downloadice-3ef93324318ccddaee2b8b88603a2b51f6d356a3.tar.bz2
ice-3ef93324318ccddaee2b8b88603a2b51f6d356a3.tar.xz
ice-3ef93324318ccddaee2b8b88603a2b51f6d356a3.zip
Merge branch '3.7' of github.com:zeroc-ice/ice into 3.7
-rw-r--r--.travis.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 561439e41c4..3a23163f314 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,9 @@ jobs:
script: $DOCKER_RUN "cd cpp; make ${MAKEFLAGS} CONFIGS='shared cpp11-shared'; ${ALLTESTS}"
env: comment=C++11
- <<: *test-staging
+ script: $DOCKER_RUN "${ALLTESTS} --filter=csharp"
+ env: comment=C#
+ - <<: *test-staging
script: $DOCKER_RUN "${ALLTESTS} --filter=java"
env: comment=Java
- <<: *test-staging