Skip to content

Commit

Permalink
Fix Travis building
Browse files Browse the repository at this point in the history
  • Loading branch information
Anton Kochkov committed Jun 18, 2019
1 parent 7e63d0b commit b86bdbd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 26 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Expand Up @@ -28,19 +28,14 @@ os:
- linux

before_install:
# Install all required dependencies
# Install all required dependencies (radare2)
- ./radeco/scripts/install-dependencies.sh

before_script:
# Load travis-cargo
- |
pip install 'travis-cargo<0.2' --user &&
export PATH=$HOME/.local/bin:$PATH
# Clone and build radare2
- |
export CC=gcc-7 && export CXX=g++7 &&
git clone https://github.com/radare/radare2.git &&
cd ./radare2 && ./sys/install.sh && cd ../
# Clone and build capstone
- |
export CC=gcc-7 && export CXX=g++7 &&
Expand Down
13 changes: 0 additions & 13 deletions radeco/scripts/install-dependencies.sh

This file was deleted.

18 changes: 11 additions & 7 deletions scripts/install-dependencies.sh
@@ -1,10 +1,14 @@
#!/usr/bin/env sh

echo "[*] Getting radare2" && \
cd ${HOME} && \
git clone https://github.com/radare/radare2 && \
cd radare2 && \
./sys/user.sh && \
export PATH=$PATH:${HOME}/bin && \
cd ${HOME}/build/radare/radeco-lib && \
# This is because Travis CI uses very old GCC version
# which still not have C99 as a default.
# .travis.yml has installation instructions for gcc-7
# Thus we enable it as a default compiler for dependencies
export CC=gcc-7
export CXX=g++-7

echo "[*] Getting radare2"
git clone https://github.com/radare/radare2 || exit 1
cd radare2 || exit 1
./sys/install.sh || exit 1
echo "[*] radare2 install success"

0 comments on commit b86bdbd

Please sign in to comment.