Merge pull request #34 from jonas/ubuntu-18.04

Update docker builds to use Ubuntu 18.04

Author: kornilova203

.travis.yml

@@ -4,11 +4,10 @@ compiler: gcc
 
 script:
  - docker-compose build $TEST_ENV
- - docker run --rm -ti scala-native-bindgen:$TEST_ENV /usr/include/ctype.h -name ctype --
- - docker-compose run --rm sbt-test
+ - docker-compose run $TEST_ENV
 
 matrix:
   include:
-  - env: TEST_ENV=ubuntu-16.04-llvm-dev
-  - env: TEST_ENV=ubuntu-16.04-llvm-6.0
-  - env: TEST_ENV=ubuntu-16.04-llvm-5.0
+  - env: TEST_ENV=ubuntu-18.04-llvm-dev
+  - env: TEST_ENV=ubuntu-18.04-llvm-6.0
+  - env: TEST_ENV=ubuntu-18.04-llvm-5.0

Dockerfile

@@ -1,36 +1,25 @@
-ARG UBUNTU_VERSION=16.04
+ARG UBUNTU_VERSION=18.04
 FROM ubuntu:$UBUNTU_VERSION
 
 RUN set -x \
  && apt update \
- && apt install -y apt-transport-https \
+ && apt install -y apt-transport-https gnupg2 ca-certificates \
  && echo "deb https://dl.bintray.com/sbt/debian /" > /etc/apt/sources.list.d/sbt.list \
  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823 \
  && apt update \
- && apt install -y curl build-essential openjdk-8-jdk-headless sbt \
+ && apt install -y curl build-essential openjdk-8-jdk-headless sbt cmake make \
  && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /cmake
-ARG CMAKE_ARCHIVE=cmake-3.11.2-Linux-x86_64
-RUN curl https://cmake.org/files/v3.11/$CMAKE_ARCHIVE.tar.gz | tar zxf - \
- && for i in bin share; do \
-      cp -r /cmake/$CMAKE_ARCHIVE/$i/* /usr/$i/; \
-    done \
- && rm -rf /cmake
-
 ARG LLVM_VERSION=6.0
+ENV LLVM_VERSION=$LLVM_VERSION
 # LLVM dev versions do not have a "-x.y" version suffix.
 ARG LLVM_DEB_COMPONENT=-$LLVM_VERSION
 RUN set -x \
  && curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
  && . /etc/lsb-release \
  && echo "deb https://apt.llvm.org/$DISTRIB_CODENAME/ llvm-toolchain-$DISTRIB_CODENAME$LLVM_DEB_COMPONENT main" > /etc/apt/sources.list.d/llvm.list \
  && apt update \
- && apt install -y clang-$LLVM_VERSION libclang-$LLVM_VERSION-dev make \
+ && apt install -y clang-$LLVM_VERSION libclang-$LLVM_VERSION-dev \
  && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /src/target
-COPY . /src
-RUN cmake .. && make VERBOSE=1
-
-ENTRYPOINT ["/src/target/scalaBindgen"]
+WORKDIR /src

README.md

@@ -25,12 +25,24 @@ cd target
 cmake ..
 make
 ./scalaBindgen /usr/include/ctype.h -name ctype --
+```
+
+Alternatively, you can use [docker-compose] to build and test the program:
+
+```sh
+# Build the docker image with LLVM version 6.0.
+docker-compose build ubuntu-18.04-llvm-6.0
+# Build the bindgen tool and run the tests.
+docker-compose run --rm ubuntu-18.04-llvm-6.0
+# Run the bindgen tool inside the container.
+docker-compose run --rm ubuntu-18.04-llvm-6.0 target/scalaBindgen -name union tests/samples/Union.h --
 ```
 
  [CMake]: https://cmake.org/
  [LLVM]: https://llvm.org/
  [Clang]: https://clang.llvm.org/
  [Scala Native setup guide]: http://www.scala-native.org/en/latest/user/setup.html
+ [docker-compose]: https://docs.docker.com/compose/
 
 ## Testing
 

docker-compose.yml

@@ -1,39 +1,42 @@
 version: '3'
 
 services:
-  ubuntu-16.04-llvm-dev:
-    image: scala-native-bindgen:ubuntu-16.04-llvm-dev
+  ubuntu-18.04-llvm-dev:
+    image: scalabindgen/scala-native-bindgen:ubuntu-18.04-llvm-dev
     build:
       context: .
       args:
-        - UBUNTU_VERSION=16.04
+        - UBUNTU_VERSION=18.04
         - LLVM_VERSION=7
         - LLVM_DEB_COMPONENT=
+    command: scripts/test.sh
+    volumes:
+      - .:/src
+      - ${HOME}/.ivy2:/root/.ivy2
+      - ${HOME}/.sbt:/root/.sbt
 
-  ubuntu-16.04-llvm-6.0:
-    image: scala-native-bindgen:ubuntu-16.04-llvm-6.0
+  ubuntu-18.04-llvm-6.0:
+    image: scalabindgen/scala-native-bindgen:ubuntu-18.04-llvm-6.0
     build:
       context: .
       args:
-        - UBUNTU_VERSION=16.04
+        - UBUNTU_VERSION=18.04
         - LLVM_VERSION=6.0
+    command: scripts/test.sh
+    volumes:
+      - .:/src
+      - ${HOME}/.ivy2:/root/.ivy2
+      - ${HOME}/.sbt:/root/.sbt
 
-  ubuntu-16.04-llvm-5.0:
-    image: scala-native-bindgen:ubuntu-16.04-llvm-5.0
+  ubuntu-18.04-llvm-5.0:
+    image: scalabindgen/scala-native-bindgen:ubuntu-18.04-llvm-5.0
     build:
       context: .
       args:
-        - UBUNTU_VERSION=16.04
+        - UBUNTU_VERSION=18.04
         - LLVM_VERSION=5.0
-
-  sbt-test:
-    image: scala-native-bindgen:${TEST_ENV}
-    entrypoint: 
-    - sh
-    - -c
-    - |
-      cd /src/tests
-      sbt compile test
+    command: scripts/test.sh
     volumes:
+      - .:/src
       - ${HOME}/.ivy2:/root/.ivy2
       - ${HOME}/.sbt:/root/.sbt

scripts/test.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# Bash strict mode
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/
+set -euo pipefail
+IFS=$'\n\t'
+
+if [[ ! -e target/.llvm-version ]] || [[ "$(<target/.llvm-version)" != "${LLVM_VERSION:-}" ]]; then
+  rm -rf target
+  mkdir -p target
+  echo "${LLVM_VERSION:-}" > target/.llvm-version
+  (cd target && cmake ..)
+  make -C target
+fi
+
+cd tests
+sbt "${@:-test}"