[libxml2] Update GitLab CI config
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] Update GitLab CI config
- Date: Sun, 20 Oct 2019 16:23:09 +0000 (UTC)
commit 55d95dcf176db8ebae11a8d0a1c328be0ab2b5d9
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Sun Oct 20 18:03:21 2019 +0200
Update GitLab CI config
- Update Dockerfile
- Don't configure with -Werror
- Don't mention Travis in CONTRIBUTING
.gitlab-ci.yml | 21 ++++++++++++---------
CONTRIBUTING | 4 ----
2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 515cb307..8b450b34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,35 @@
default:
- # The image was generated with the following Dockerfile:
+ # The image was generated with the following Dockerfile. It is also used
+ # for libxslt, that's why we need git and libgcrypt-dev.
#
# FROM ubuntu:19.04
# RUN apt-get update && \
# apt-get upgrade -y && \
# apt-get install -y --no-install-recommends \
+ # git ca-certificates \
# autoconf automake libtool pkg-config \
- # gcc clang make \
- # python-dev zlib1g-dev liblzma-dev
+ # make gcc clang \
+ # python-dev zlib1g-dev liblzma-dev libgcrypt-dev
image: registry.gitlab.gnome.org/gnome/libxml2
.test:
script:
- - sh autogen.sh $CONFIG
- - make -j$(nproc) V=1
- - make check
+ - |
+ sh autogen.sh $CONFIG
+ make -j$(nproc) V=1 CFLAGS="$CFLAGS -Werror"
+ make check
gcc:
extends: .test
variables:
- CFLAGS: "-O2 -std=c89 -D_XOPEN_SOURCE=700 -Werror"
+ CFLAGS: "-O2 -std=c89 -D_XOPEN_SOURCE=700"
clang:asan:
extends: .test
variables:
CONFIG: "--without-python"
CC: clang
- CFLAGS: "-O2 -g -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize=pointer-overflow
-fno-sanitize-recover=all -Werror -Wno-error=cast-align"
+ CFLAGS: "-O2 -g -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize=pointer-overflow
-fno-sanitize-recover=all -Wno-error=cast-align"
UBSAN_OPTIONS: "print_stacktrace=1"
clang:msan:
@@ -34,5 +37,5 @@ clang:msan:
variables:
CONFIG: "--without-python --without-zlib --without-lzma"
CC: clang
- CFLAGS: "-O2 -g -fno-omit-frame-pointer -fsanitize=memory -Werror -Wno-error=cast-align"
+ CFLAGS: "-O2 -g -fno-omit-frame-pointer -fsanitize=memory -Wno-error=cast-align"
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 7189d74e..dad45676 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -18,7 +18,3 @@ if possible.
All code must conform to C89 and pass the "make check" tests. Avoid
compiler warnings and add regression tests if possible.
-The .travis.yml file can be used to thoroughly check the build with strict
-compiler flags, ASan and UBSan. Fork the libxml2 mirror on GitHub and set
-up Travis to test the commits you make on your fork.
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]