Skip to content

Commit

Permalink
Included docker build into the travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
basvodde committed Apr 21, 2020
1 parent 41ab11b commit 404bc23
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -88,6 +88,7 @@ jobs:
packages:
- libc++-dev
- valgrind
- env: BUILD=docker_ubuntu_autotools

This comment has been minimized.

Copy link
@offa

offa Apr 21, 2020

Contributor

@basvodde Is the purpose of this build to test the docker image or autotools on ubuntu?

This comment has been minimized.

Copy link
@basvodde

basvodde Apr 22, 2020

Author Member

Mostly to test the docker image and that CppUTest runs in there.


global:
- secure: |-
Expand Down
7 changes: 6 additions & 1 deletion scripts/travis_ci_build.sh
Expand Up @@ -6,6 +6,7 @@ if [[ "$CXX" == clang* ]]; then
export CXXFLAGS="-stdlib=libc++"
fi

export CPPUTEST_HOME=$TRAVIS_BUILD_DIR

if [ "x$BUILD" = "xautotools" ]; then
autoreconf -i ..
Expand Down Expand Up @@ -94,12 +95,16 @@ if [ "x$BUILD" = "xcmake_coverage" ]; then
coveralls -b . -r .. -i "src" -i "include" --gcov-options="-lbc" || true
fi

if [ "x$BUILD" = "xdocker_ubuntu_autotools" ]; then
$(CPPUTEST_HOME)/scripts/create_docker_images_and_containers ubuntu
docker start -i cpputest_ubuntu
fi

if [ "x$BUILD" = "xmake_dos" ]; then
wget http://ftp.openwatcom.org/install/open-watcom-c-linux-1.9 -O /tmp/watcom.zip
mkdir -p watcom && unzip -aqd watcom /tmp/watcom.zip && chmod -R +x watcom/binl
export PATH=$PATH:$PWD/watcom/binl
export WATCOM=$PWD/watcom
export CPPUTEST_HOME=$TRAVIS_BUILD_DIR
export CC=wcl
export CXX=wcl
$CC --version
Expand Down

0 comments on commit 404bc23

Please sign in to comment.