Merge branch 'master' into move-scala_macro_library_rule

long-stripe · long-stripe · commit da58a6c1f8dc · 2019-08-20T18:42:51.000-04:00
* master: Disable windows CI (bazel-contrib#823)
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,8 @@ cache:
 os:
   - linux
   - osx
-  - windows
+# re-enable when someone can get windows green
+#  - windows
 
 ###
 #

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ cache:`
`16`	`16`	`os:`
`17`	`17`	`- linux`
`18`	`18`	`- osx`
`19`		`- - windows`
	`19`	`+# re-enable when someone can get windows green`
	`20`	`+# - windows`
`20`	`21`
`21`	`22`	`###`
`22`	`23`	`#`