Skip to content
Permalink
Browse files

build, bugfix: clang build env (#486)

  • Loading branch information...
ngot authored and xicilion committed Apr 6, 2019
1 parent 80d823a commit 0a565f3fec46d8b45ba318c8ad5880553d17eaf1
Showing with 9 additions and 5 deletions.
  1. +0 −3 .travis.yml
  2. +1 −1 .travis/build.sh
  3. +8 −1 .travis/test.sh
@@ -40,9 +40,6 @@ before_install:
install:
- git submodule init
- git submodule update
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
docker pull fibjs/build-env:latest;
fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install xz;
fi
@@ -4,7 +4,7 @@ set -ev

if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
echo "start docker build..."
DIR=`pwd`;sudo docker run -it -v ${DIR}:/home/ci fibjs/build-env:latest /bin/sh -c "cd /home/ci; sh build -j2 ${ARCH} ci"
DIR=`pwd`;sudo docker run -it -v ${DIR}:/home/ci fibjs/build-env:clang /bin/sh -c "cd /home/ci; sh build -j2 ${ARCH} ci"
else
sh build -j2 ${ARCH} ci
fi
@@ -4,7 +4,14 @@ set -ev

if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
if [[ $ARCH == "amd64" ]]; then
./bin/Linux_amd64_release/fibjs --prof test
# Test on ubuntu:18.04
DIR=`pwd`;sudo docker run -it -v ${DIR}:/home/ci ubuntu:18.04 /bin/sh -c "cd /home/ci; ./bin/Linux_amd64_release/fibjs --prof test/main.js"

# Test on ubuntu:16.04
DIR=`pwd`;sudo docker run -it -v ${DIR}:/home/ci ubuntu:16.04 /bin/sh -c "cd /home/ci; ./bin/Linux_amd64_release/fibjs --prof test/main.js"

# Test on ubuntu:14.04
DIR=`pwd`;sudo docker run -it -v ${DIR}:/home/ci ubuntu:14.04 /bin/sh -c "cd /home/ci; ./bin/Linux_amd64_release/fibjs --prof test/main.js"
fi
else # darwin
if [[ $ARCH == "amd64" ]]; then

0 comments on commit 0a565f3

Please sign in to comment.
You can’t perform that action at this time.