Skip to content

Commit

Permalink
Include GnuTLs in the Travis build
Browse files Browse the repository at this point in the history
.travis.yml

Add in the gnutls build.

build-env/Dockerfile.build-env
build-env/Dockerfile.develop

Add in libgnutls28-dev to the apt-get list.

scripts/build.sh
scripts/dist.sh

Support TLS set to gnutls for building.
  • Loading branch information
mrdeep1 committed Nov 27, 2018
1 parent 48ee2ec commit e172e68
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -11,6 +11,7 @@ services:
env:
- PLATFORM=posix TESTS=yes TLS=no
- PLATFORM=posix TESTS=yes TLS=openssl
- PLATFORM=posix TESTS=yes TLS=gnutls
- PLATFORM=posix TESTS=yes TLS=tinydtls
- PLATFORM=contiki TLS=no
- PLATFORM=lwip TLS=no
Expand Down
2 changes: 1 addition & 1 deletion build-env/Dockerfile.build-env
Expand Up @@ -2,6 +2,6 @@ FROM debian:testing-slim

RUN apt-get update && apt-get install -y autoconf automake gcc clang \
libtool libtool-bin make pkg-config libcunit1-dev libssl-dev \
exuberant-ctags git valgrind \
libgnutls28-dev exuberant-ctags git valgrind \
graphviz doxygen libxml2-utils xsltproc docbook-xml docbook-xsl asciidoc
RUN apt-get clean
2 changes: 1 addition & 1 deletion build-env/Dockerfile.develop
Expand Up @@ -17,7 +17,7 @@ RUN git clone --depth 1 https://github.com/cabo/cn-cbor.git && cd cn-cbor && ./b
FROM debian:testing-slim

RUN apt-get update && apt-get install -y autoconf automake gcc g++ gdb libtool libtool-bin make \
pkg-config libssl-dev
pkg-config libssl-dev libgnutls28-dev
RUN apt-get install -y iproute2 lsof net-tools inetutils-ping netcat-openbsd less vim
RUN apt-get clean

Expand Down
2 changes: 2 additions & 0 deletions scripts/build.sh
Expand Up @@ -10,6 +10,8 @@ case "x${TLS}" in
;;
xopenssl) WITH_TLS="--with-openssl"
;;
xgnutls) WITH_TLS="--with-gnutls"
;;
xtinydtls) WITH_TLS="--with-tinydtls --disable-shared"
;;
*) WITH_TLS="--with-gnutls"
Expand Down
2 changes: 2 additions & 0 deletions scripts/dist.sh
Expand Up @@ -31,6 +31,8 @@ case "x${TLS}" in
;;
xopenssl) WITH_TLS="--with-openssl"
;;
xgnutls) WITH_TLS="--with-gnutls"
;;
xtinydtls) WITH_TLS="--with-tinydtls --disable-shared"
;;
*) WITH_TLS="--with-gnutls"
Expand Down

0 comments on commit e172e68

Please sign in to comment.