On Sun, 2017-11-05 at 23:42 +0100, Niels Möller wrote:
> Nikos Mavrogiannopoulos <n...@redhat.com> writes:
>
> > The changes seem good and backwards compatible. I haven't tested
> > compiling gnutls or running its test suite though.
>
> Let me know when you have been able to do that.
>
> With the ABI and CFB changes now in, I think we're now in the testing
> phase before the release. I've updated the NEWS file
> (https://git.lysator.liu.se/nettle/nettle/blob/master/NEWS) and the
> release plan (http://www.lysator.liu.se/~nisse/nettle/plan.html).
>
> Review of the NEWS file is appreciated.
>
> Anything else which we should try to get in before release?
There is a run of it at (doesn't seem to compile):
https://gitlab.com/nmav/nettle/-/jobs/39216682
(if the intention was to be API compatible that breaks it, but if not,
what would be your suggestion in handling that?)
I suggest including the attached patches to the CI. The first makes
sure that random errors due to installation of fedora packages don't
get in the way by using the pre-build images used in gnutls. The second
it includes gnutls build in the CI to detect breakages early.
regards,
Nikos
From 461e126f6415de8f1a6909ad61356812b98f67ae Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <n...@redhat.com>
Date: Mon, 6 Nov 2017 16:19:55 +0100
Subject: [PATCH 1/2] .gitlab-ci.yml: use pre-installed images for gnutls
This avoids the need to install packages during check, and
reduces failures due to infrastructure.
Signed-off-by: Nikos Mavrogiannopoulos <n...@redhat.com>
---
.gitlab-ci.yml | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cfc1dcb..4a78430c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,17 @@
-image: centos:7
+variables:
+ BUILD_IMAGES_PROJECT: gnutls/build-images
+ FEDORA_BUILD: buildenv-f26
+ FEDORA_X86_BUILD: buildenv-f26-x86
+ GET_SOURCES_ATTEMPTS: "3"
+# remove any pre-installed headers from nettle
before_script:
- - yum install -y git make autoconf libtool automake gettext-devel glibc-devel gcc valgrind libasan-static libgcc.i686 glibc-devel.i686
+ - yum remove -y nettle-devel
# See http://doc.gitlab.com/ce/ci/yaml/ for documentation.
build/x86-64:
+ image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - yum install -y gmp-devel
- ./.bootstrap &&
./configure --enable-fat --disable-documentation && make -j4 &&
make check -j4
@@ -15,8 +20,8 @@ build/x86-64:
except:
- tags
build/x86:
+ image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_X86_BUILD
script:
- - yum install -y gmp-devel.i686
- ./.bootstrap &&
PKG_CONFIG_PATH="/usr/lib/pkgconfig/" CFLAGS="-O2 -g -m32" LDFLAGS="-m32" ./configure --build=i686-redhat-linux --enable-fat --disable-documentation && make -j4 &&
make check -j4
@@ -38,6 +43,7 @@ build/aarch64:
except:
- tags
build/mini-gmp:
+ image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- ./.bootstrap &&
./configure --disable-documentation --enable-mini-gmp && make -j4 &&
@@ -47,9 +53,8 @@ build/mini-gmp:
except:
- tags
build/ubsan:
- image: fedora:26
+ image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - yum install -y gmp-devel libubsan-static libubsan
- ./.bootstrap &&
CXXFLAGS="-fsanitize=undefined -fno-sanitize-recover -g -O2" CFLAGS="-fsanitize=undefined -fno-sanitize-recover -g -O2" ./configure
--disable-documentation && make -j4 && make check -j4
@@ -58,9 +63,8 @@ build/ubsan:
except:
- tags
build/asan:
- image: fedora:26
+ image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - yum install -y gmp-devel
- ./.bootstrap &&
- CXXFLAGS="-fsanitize=address -g -O2" CFLAGS="-fsanitize=address -g -O2" ./configure --disable-documentation &&
make -j4 && make check -j4
@@ -69,9 +73,8 @@ build/asan:
except:
- tags
build/static-analyzers:
- image: fedora:26
+ image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - yum install -y gmp-devel clang compiler-rt cppcheck clang-analyzer
- ./.bootstrap
- scan-build ./configure --disable-documentation
- scan-build --status-bugs -o scan-build-lib make -j$(nproc)
@@ -84,4 +87,3 @@ build/static-analyzers:
when: on_failure
paths:
- scan-build-lib/*
-
--
2.13.6
From fbc91bad31345eaaf5319f66460b19640c0bcd10 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <n...@redhat.com>
Date: Mon, 6 Nov 2017 16:32:48 +0100
Subject: [PATCH 2/2] .gitlab-ci.yml: added build with gnutls
Signed-off-by: Nikos Mavrogiannopoulos <n...@redhat.com>
---
.gitlab-ci.yml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a78430c..f4b07cfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,3 +87,17 @@ build/static-analyzers:
when: on_failure
paths:
- scan-build-lib/*
+build/gnutls:
+ image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
+ script:
+ - ./.bootstrap &&
+ - ./configure --disable-documentation --prefix=/usr --libdir=/usr/lib64 &&
+ make -j4 && make install
+ - git clone --depth 1 --branch master https://gitlab.com/gnutls/gnutls.git gnutls-git
+ - cd gnutls-git && git submodule update --init && make autoreconf &&
+ ./configure --disable-cxx --disable-guile --disable-doc && make -j$(nproc) &&
+ make -j $(nproc) check
+ tags:
+ - shared
+ except:
+ - tags
--
2.13.6
_______________________________________________
nettle-bugs mailing list
nettle-bugs@lists.lysator.liu.se
http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs
