aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2017-05-19 11:58:19 +0800
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2017-05-19 11:58:54 +0800
commitaf0ad494348d0f2d773232b5913d5c86787e39f5 (patch)
treea73b262470ac02556ef5e01e9d084d009c603aa7
parenta9e002af18b82a6f476507a9ff03eebcc19f867c (diff)
downloadmitmproxy-af0ad494348d0f2d773232b5913d5c86787e39f5.tar.gz
mitmproxy-af0ad494348d0f2d773232b5913d5c86787e39f5.tar.bz2
mitmproxy-af0ad494348d0f2d773232b5913d5c86787e39f5.zip
disable double requires-io-master CI builds
-rw-r--r--.appveyor.yml4
-rw-r--r--.travis.yml6
2 files changed, 9 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 53e33614..549a0607 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,6 +1,10 @@
version: '{build}'
build: off # Not a C# project
+branches:
+ except:
+ - requires-io-master
+
environment:
CI_DEPS: codecov>=2.0.5
CI_COMMANDS: codecov
diff --git a/.travis.yml b/.travis.yml
index 26894eee..0ff0fb59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
sudo: false
language: python
+branches:
+ except:
+ - requires-io-master
+
env:
global:
- CI_DEPS=codecov>=2.0.5
- CI_COMMANDS=codecov
+
git:
depth: 10000
@@ -104,4 +109,3 @@ cache:
directories:
- $HOME/.pyenv
- $HOME/.cache/pip
- # - $HOME/build/mitmproxy/mitmproxy/.tox