summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2018-01-04 13:01:53 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2018-01-04 17:06:58 +0100
commit2529b32a00140b1a636bc5716780347b8b98ee94 (patch)
treead2527cd5bfd4a4dc567dbeda0e266b7dd52d468
parente4fabba4628090c07383b838d0c5b869cd9bebc8 (diff)
downloadlibtasn1-tmp-protect-ber-decoder-from-recursion2.tar.gz
.gitlab-ci.yml: removed references to i686 package installationtmp-protect-ber-decoder-from-recursion2
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--.gitlab-ci.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2592683..4292d78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
image: centos:7
before_script:
- - yum install -y git make bison autoconf libtool automake gettext-devel glibc-devel gcc valgrind clang libasan-static libubsan libgcc.i686 glibc-devel.i686
+ - yum install -y git make bison autoconf libtool automake gettext-devel glibc-devel gcc valgrind clang libasan-static libubsan
# See http://doc.gitlab.com/ce/ci/yaml/ for documentation.
Build and Check (x86-64):
@@ -13,6 +13,7 @@ Build and Check (x86-64):
- shared
Build and Check (x86):
script:
+ - yum install -y libgcc.i686 glibc-devel.i686
- git submodule update --init && make autoreconf &&
PKG_CONFIG_PATH="/usr/lib/pkgconfig/" CFLAGS="-O2 -g -m32" LDFLAGS="-m32" ./configure --build=i686-redhat-linux --target=i686-redhat-linux --disable-doc && make -j4 && make -j4 check
except:
@@ -38,7 +39,7 @@ Build and Check with asan:
Build and Check with ubsan:
image: fedora:24
script:
- - yum install -y git make autoconf libtool automake gettext-devel glibc-devel gcc valgrind clang libasan-static libubsan libgcc.i686 glibc-devel.i686
+ - yum install -y git make autoconf libtool automake gettext-devel glibc-devel gcc valgrind clang libasan-static libubsan
- git submodule update --init && make autoreconf && CFLAGS="-fsanitize=undefined -fno-sanitize-recover -g
-O2" ./configure --disable-doc --disable-valgrind-tests && make -j4 && make check -j4
tags: