From 89129099c67f7aa7927e8dbc945d2f9b8d7d5ed1 Mon Sep 17 00:00:00 2001 From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com> Date: Fri, 13 Jul 2018 08:40:05 -0300 Subject: [PATCH 1/4] Simplified .travis.yml --- .travis.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9e6b6e..e8296aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,8 @@ python: install: - pip install pyflakes - sudo apt-get -y update -- sudo apt-get -y install build-essential gcc-multilib cmake python python-setuptools libffi-dev -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then git clone https://github.com/Z3Prover/z3.git; fi -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then cd z3; fi -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then python scripts/mk_make.py; fi -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then cd build; fi -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then make; fi -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then sudo make install; fi -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then cd ../..; fi +- sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev +- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then sudo pip install manticore - mkdir build - cd build - cmake .. From 06ce1af7994da660c6259ec0052ffd0076d89273 Mon Sep 17 00:00:00 2001 From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com> Date: Fri, 13 Jul 2018 08:44:34 -0300 Subject: [PATCH 2/4] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e8296aa..00a7d46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ install: - pip install pyflakes - sudo apt-get -y update - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then sudo pip install manticore +- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then sudo pip install -U pip ; sudo pip install manticore ; fi - mkdir build - cd build - cmake .. From 516fa6e2821b3b32eeeba68c181d0301e5ab64a5 Mon Sep 17 00:00:00 2001 From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com> Date: Fri, 13 Jul 2018 09:04:44 -0300 Subject: [PATCH 3/4] Use the latest revision of Manticore from its master branch --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 00a7d46..72d396e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ install: - sudo apt-get -y update - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev - if [ $DEEPSTATE_CMD = deepstate-manticore ]; then sudo pip install -U pip ; sudo pip install manticore ; fi +- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then pip uninstall -y Manticore || echo "Manticore not cached" ; fi +- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then pip install https://github.com/trailofbits/manticore/archive/master.zip ; fi - mkdir build - cd build - cmake .. From 8c0d25e2eededeb775f408f885fcfea9173559e1 Mon Sep 17 00:00:00 2001 From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com> Date: Fri, 13 Jul 2018 09:05:38 -0300 Subject: [PATCH 4/4] Forgot to use sudo! --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72d396e..64a9cbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ install: - sudo apt-get -y update - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev - if [ $DEEPSTATE_CMD = deepstate-manticore ]; then sudo pip install -U pip ; sudo pip install manticore ; fi -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then pip uninstall -y Manticore || echo "Manticore not cached" ; fi -- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then pip install https://github.com/trailofbits/manticore/archive/master.zip ; fi +- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then sudo pip uninstall -y Manticore || echo "Manticore not cached" ; fi +- if [ $DEEPSTATE_CMD = deepstate-manticore ]; then sudo pip install https://github.com/trailofbits/manticore/archive/master.zip ; fi - mkdir build - cd build - cmake ..