Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Travis: use regular OSX image

This commit is contained in:
Pierre LALET 2017-12-05 10:07:26 +01:00
parent af1d768087
commit a92cbab0bc
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -33,13 +33,11 @@ matrix:
- os: osx - os: osx
language: generic language: generic
osx_image: xcode7.3
- os: osx - os: osx
language: generic language: generic
osx_image: xcode7.3
env: env:
- SCAPY_SUDO=false SCAPY_USE_PCAPDNET=yes - SCAPY_USE_PCAPDNET=yes
# Run as root # Run as root
- os: linux - os: linux
@ -106,13 +104,11 @@ matrix:
- os: osx - os: osx
language: generic language: generic
osx_image: xcode7.3
env: env:
- SCAPY_SUDO=sudo SCAPY_COVERAGE=yes - SCAPY_SUDO=sudo SCAPY_COVERAGE=yes
- os: osx - os: osx
language: generic language: generic
osx_image: xcode7.3
env: env:
- SCAPY_SUDO=sudo SCAPY_USE_PCAPDNET=yes SCAPY_COVERAGE=yes - SCAPY_SUDO=sudo SCAPY_USE_PCAPDNET=yes SCAPY_COVERAGE=yes

2
.travis/install.sh
View File

@ -1,3 +1,5 @@
PIP=`which pip || (python --version | grep -q 'Python 2' && which pip2) || (python --version | grep -q 'Python 3' && which pip3)`
# Install dependencies using pip # Install dependencies using pip
if [ -z "$SCAPY_SUDO" -o "$SCAPY_SUDO" = "false" ] if [ -z "$SCAPY_SUDO" -o "$SCAPY_SUDO" = "false" ]
then then