aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2019-01-26 13:11:53 +0100
committerToni Uhlig <matzeton@googlemail.com>2019-01-26 13:11:53 +0100
commit64699b4beca3ca50da02ef3f434b79a9b8d0b716 (patch)
treefb20e7fa954b7968e72fbf336571969de1bf15b1
parent9ca68e43eac3ad3a49fc2440e89fd89f4ce88881 (diff)
travis-ci/gitlab-ci: clang-5.0 build, gitlab.com pipeline badge
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--.travis.yml9
-rw-r--r--README.md1
3 files changed, 13 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df158f1..d5c36cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,18 +8,22 @@ build:
- apt-get -qq update
- apt-get install -y git debhelper fakeroot
- apt-get install -y libpcap-dev libselinux1-dev
- - apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64 mingw-w64-i686-dev mingw-w64-common
+ - apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64 mingw-w64-i686-dev mingw-w64-common clang-5.0
- apt-get install -y autoconf automake dh-autoreconf
- mkdir -p ../bin
- ./autogen.sh
- cp ./src/ptunnel-ng ../bin/
- git clean -df . && dpkg-buildpackage -b -us -uc
- - git clean -df . && export CC=i686-w64-mingw32-gcc && ./autogen.sh --host=i686-w64-mingw32 --build=$(gcc -dumpmachine)
+ - git clean -df . && export CC=i686-w64-mingw32-gcc && autoreconf -fi &&
+ ./configure --host=i686-w64-mingw32 --build=$(gcc -dumpmachine) &&
+ make CFLAGS='-Werror'
- cp ./src/ptunnel-ng.exe ../bin/
- mkdir -p ./bin
- cp -v ../*.deb ../bin/* ./bin/
- cp -v ./bin/ptunnel-ng ./bin/ptunnel-ng-dbgsym && strip -s ./bin/ptunnel-ng
- cp -v ./bin/ptunnel-ng.exe ./bin/ptunnel-ng-dbgsym.exe && i686-w64-mingw32-strip -s ./bin/ptunnel-ng.exe
+ - git clean -df . && export CC=clang-5.0 && autoreconf -fi && ./configure && make
+ CFLAGS='-Werror -Wno-error=for-loop-analysis' V=s
artifacts:
paths:
- bin/
diff --git a/.travis.yml b/.travis.yml
index e9a181d..f1e8f97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ before_install:
- sudo apt-get -qq update
- sudo apt-get install -y git debhelper fakeroot
- sudo apt-get install -y libpcap-dev libselinux1-dev libbsd-dev
-- sudo apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64 mingw-w64-i686-dev
+- sudo apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64 mingw-w64-i686-dev clang-5.0
mingw-w64-common
- sudo apt-get install -y autoconf automake dh-autoreconf
after_failure:
@@ -11,8 +11,11 @@ after_failure:
script:
- ./autogen.sh
- git clean -df . && dpkg-buildpackage -b -us -uc
-- git clean -df . && export CC=i686-w64-mingw32-gcc && ./autogen.sh --host=i686-w64-mingw32
- --build=$(gcc -dumpmachine)
+- git clean -df . && export CC=i686-w64-mingw32-gcc && autoreconf -fi &&
+ ./configure --host=i686-w64-mingw32 --build=$(gcc -dumpmachine) && make
+ CFLAGS='-Werror'
+- git clean -df . && export CC=clang-5.0 && autoreconf -fi && ./configure && make
+ CFLAGS='-Werror -Wno-error=for-loop-analysis' V=s
env:
global:
- secure: DqyBATbSy6uoCpJ9MsedJID1SBWnHM0FMXJS2E4FbMwEaoOLWw/7EiLZUrIxcuAGyaztd4xuve3den07xt7uOL6RBebVjh8ZbNxR92ndxsDcsvLFEUTeTvDOsu7vYmocLw95x5GFPWygOP1PGe/QpQKHo6MMT5Px0if7LFiFi8bGj5lpuiL5C7l2IsWhmaLB3oIMK7z/JXPQSkXjYjzahS7dDRr7LnkQpEtywmSHGn5xD3QCZIUysDQV3lsy6zWUC6YLXMeu7JLgh/T6BAO2Zqj4uNlIrhGkh9OOx6OopjvklP0GFqJkSN1i2iPEDuuLx0+eLMUiGREAmWldt7aKwyCVH7r8zcTRSMk2E0jJ4wdd5hHbMUzG3LohmRfxlbcwL0MiOBeCR2MTQBsPXmjXJs4Qf82blQrp2Hxm0sE3KyswDEDQUBTKbRzVFPjYLTRASzIZrDG7j+CjkLRSESyXU3u8IIiE0wr75lhNWL58ZrVzjyZIxCgo8oOeK/yF+6F3hyCSnh/bFkCjvcHMsYInyVZCLgYkYeLHujbvgbiIPOAk50ikTz8AvKMCgK313O6/LjNaJu2GgezN0j2/mKGyvucBJM2QTys7AYp8QfUWy5bOaKcyHq0guu8/lrB8gp2bvIe5xL1HVrmBBvOKzuvwylLCO71Mb4P0zTxeMFwQyVs=
diff --git a/README.md b/README.md
index 5d48190..14f7c38 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
[![Build Status](https://travis-ci.org/lnslbrty/ptunnel-ng.svg?branch=master)](https://travis-ci.org/lnslbrty/ptunnel-ng)
+[![Pipeline Status](https://gitlab.com/lnslbrty/ptunnel-ng/badges/master/pipeline.svg)](https://gitlab.com/lnslbrty/ptunnel-ng/commits/master)
[![Coverity Status](https://scan.coverity.com/projects/14737/badge.svg?flat=1)](https://scan.coverity.com/projects/14737)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/021aa1d88dd7486db83df3ff96f9eff8)](https://www.codacy.com/app/lnslbrty/ptunnel-ng?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=lnslbrty/ptunnel-ng&amp;utm_campaign=Badge_Grade)
[![GitHub issues](https://img.shields.io/github/issues/lnslbrty/ptunnel-ng.svg)](https://github.com/lnslbrty/ptunnel-ng/issues)