use travis stages, use docker multistage builds

1 files changed, 57 insertions, 32 deletions

diff --git a/dist/linux/travis-ci.sh b/dist/linux/travis-ci.sh
index 0c21ed545..d423db9e6 100755
--- a/dist/linux/travis-ci.sh
+++ b/dist/linux/travis-ci.sh
@@ -1,11 +1,34 @@
 #! /bin/bash
 # This script is executed in the travis-ci environment.
 
+build_img_ghdl() {
+    # Build ghdl/ghdl from ghdl/run
+    echo "travis_fold:start:build_run"
+    travis_time_start
+    printf "$ANSI_BLUE[DOCKER build] ghdl : ${IMAGE_TAG}$ANSI_NOCOLOR\n"
+
+    PKG=`ls | grep -oP 'ghdl-.*tgz'`
+    mkdir tmp-img && cd tmp-img
+    cp ../$PKG ./
+    cp ../BUILD_TOOLS ./
+    echo "FROM ghdl/run:$IMAGE_TAG" > Dockerfile
+    echo "ADD $PKG /usr/local" >> Dockerfile
+    docker build -t ghdl/ghdl:$IMAGE_TAG .
+    cd ..
+    travis_time_finish
+    echo "travis_fold:end:build_run"
+}
+
+#---
+
 set -e
 
+. dist/linux/travis-utils.sh
 . dist/ansi_color.sh
 #disable_color
 
+scriptdir=$(dirname $0)
+
 
 # Display env (to debug)
 
@@ -14,6 +37,14 @@ printf "$ANSI_YELLOW[TRAVIS] Travis environment $ANSI_NOCOLOR\n"
 env | grep TRAVIS
 echo -en "travis_fold:end:travis_env\r"
 
+
+if [ "$IMAGE" = "" ]; then
+    echo "IMAGE not defined"
+    exit 1
+fi
+
+
+echo "travis_fold:start:patch_version"
 # The command 'git describe' (used for version) needs the history. Get it.
 # But the following command fails if the repository is complete.
 git fetch --unshallow || true
@@ -22,6 +53,8 @@ git fetch --unshallow || true
 # correctly set).
 make -f Makefile.in srcdir=. version.tmp
 cp version.tmp src/version.in
+echo "travis_fold:end:patch_version"
+
 
 # Compute package name
 
@@ -37,25 +70,21 @@ else
     PKG_TAG="$TRAVIS_TAG"
 fi
 
-if [ "$IMAGE" = "" ]; then
-    echo "IMAGE not defined"
-    exit 1
-fi
-
 IFS='+' read -ra REFS <<< "$IMAGE"
 DDIST=${REFS[0]}
 DBLD=${REFS[1]}
 DGPL=${REFS[2]}
 
 PKG_NAME="ghdl-${PKG_TAG}-${DBLD}-${DDIST}"
-BUILD_CMD="./dist/linux/buildtest.sh $ENABLECOLOR -b $DBLD"
+BUILD_CMD_OPTS="$ENABLECOLOR -b $DBLD"
 if [ "$DGPL" = "gpl" ]; then
-    BUILD_CMD="$BUILD_CMD --gpl"
+    BUILD_CMD_OPTS="$BUILD_CMD_OPTS --gpl"
     PKG_NAME="ghdl-gpl-${PKG_TAG}"
 fi
-BUILD_CMD="${BUILD_CMD} -p $PKG_NAME"
+BUILD_CMD_OPTS="${BUILD_CMD_OPTS} -p $PKG_NAME"
+
+echo "build cmd: $BUILD_CMD_OPTS"
 
-echo "build cmd: $BUILD_CMD"
 
 # Build
 
@@ -64,37 +93,33 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
     ./dist/macosx/install-ada.sh || exit 1
     PATH=$PWD/gnat/bin:$PATH
 
-    bash -c "$BUILD_CMD"
+    bash -c "${scriptdir}/build.sh $BUILD_CMD_OPTS"
 else
     # Assume linux
 
-    # Create docker image
-
-    . ./dist/linux/travis-utils.sh
-
-    echo "travis_fold:start:create"
-    travis_time_start
-    printf "$ANSI_YELLOW[DOCKER build] Docker build $ANSI_NOCOLOR\n"
-
-    DOCKERFILE="dist/linux/docker/build-$IMAGE"
-
-    echo "dockerfile: $DOCKERFILE"
-    DOCKER_NAME=`echo $IMAGE | sed -e 's/+/-/g'`
+    # Run build in docker
+    IMAGE_TAG=`echo $IMAGE | sed -e 's/+/-/g'`
+    docker run --rm -t -v $(pwd):/work -w "/work" ghdl/build:$IMAGE_TAG bash -c "${scriptdir}/build.sh $BUILD_CMD_OPTS"
+fi
 
-    docker build -t $DOCKER_NAME - < $DOCKERFILE
-    travis_time_finish
-    echo "travis_fold:end:create"
+if [ ! -f build_ok ]; then
+    printf "$ANSI_RED[TRAVIS] BUILD failed $ANSI_NOCOLOR\n"
+    exit 1
+fi
 
 
-    # Run build+test in docker
+# Test
 
-    docker run --rm --tty --volume $(pwd):/work -w "/work" $DOCKER_NAME bash -c "$BUILD_CMD"
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    bash -c "prefix=$(realpath ./install-mcode) ${scriptdir}/test.sh $BUILD_CMD_OPTS"
+else
+    # Build ghdl/ghdl:$IMAGE_TAG image
+    build_img_ghdl
+    # Run test in docker container
+    docker run --rm -t -v $(pwd):/work -w "/work" ghdl/ghdl:$IMAGE_TAG bash -c "GHDL=ghdl ${scriptdir}/test.sh $BUILD_CMD_OPTS"
 fi
 
-
-ls -l ghdl-*
-
-if [ ! -f build_ok ]; then
-    printf "$ANSI_RED[TRAVIS] BUILD failed $ANSI_NOCOLOR\n"
+if [ ! -f test_ok ]; then
+    printf "$ANSI_RED[TRAVIS] TEST failed $ANSI_NOCOLOR\n"
     exit 1
 fi