aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-12-03 14:45:44 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-12-03 14:45:44 +0100
commit8ef0624b517ad82791eb633d00baf7efaa0b7b5a (patch)
tree0685c77bc18ca017a1658c9808a5442eb3fdb23d
parent1619af14865f6fa86829b13ce4cffc338e8e03a9 (diff)
parentda50120502aa0561494ac1d3b5c1e617198b8f58 (diff)
downloadmitmproxy-8ef0624b517ad82791eb633d00baf7efaa0b7b5a.tar.gz
mitmproxy-8ef0624b517ad82791eb633d00baf7efaa0b7b5a.tar.bz2
mitmproxy-8ef0624b517ad82791eb633d00baf7efaa0b7b5a.zip
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
-rw-r--r--.appveyor.yml24
1 files changed, 21 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index dbb6d2fa..5e0f3813 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,9 +3,27 @@ shallow_clone: true
environment:
matrix:
- PYTHON: "C:\\Python27"
+ PATH: "C:\\Python27;C:\\Python27\\Scripts;%PATH%"
+ PYINSTALLER_VERSION: "git+https://github.com/pyinstaller/pyinstaller.git"
install:
- - "%PYTHON%\\Scripts\\pip install --src . -r requirements.txt"
- - "%PYTHON%\\python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
+ - "pip install --src .. -r requirements.txt"
+ - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
build: off # Not a C# project
test_script:
- - "%PYTHON%\\Scripts\\py.test -n 4" \ No newline at end of file
+ - "py.test -n 4"
+after_test:
+ - |
+ git clone https://github.com/mitmproxy/release.git ..\release
+ pip install -e ..\release
+ python ..\release\rtool.py -p mitmproxy bdist
+ - ps: Get-ChildItem ..\release\dist\*.zip | ForEach { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+deploy:
+- provider: FTP
+ host: 46.101.230.67:2222
+ protocol: sftp
+ username: travis
+ password:
+ secure: +Ousom/XDCLx9+bUjr1mRKepgIzLdqP+clMpoAiPXUysZCDGxODD/7ij4z8GJ3AF
+ folder: snapshots
+ on:
+ branch: master \ No newline at end of file