On Sat, 2018-12-29 at 10:40 +0100, Niels Möller wrote:
> Nikos Mavrogiannopoulos <[email protected]> writes:
> 
> > I am not at home to check but most likely a newer openssl is
> > needed. You can use fedora:29 or fedora:latest
> 
> Ok, I'm trying 

I attach a patch which moves everything to the latest images used by
gnutls (i.e., in addition to your patch, it also moves the x86 builds
to debian).

The gnutls build now passes but the static analyzers fail as you also
saw. A quick fix would be to leave the static analyzers to use f28
though that would need to be solved eventually.

regards,
Nikos

From 76ef226e8c309a3aacb1cfa52edf7d90e1f3d070 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <[email protected]>
Date: Wed, 2 Jan 2019 10:31:08 +0100
Subject: [PATCH] .gitlab-ci.yml: updated to new images by gnutls

Signed-off-by: Nikos Mavrogiannopoulos <[email protected]>
---
 .gitlab-ci.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 166de71b..96a007e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 variables:
   BUILD_IMAGES_PROJECT: gnutls/build-images
   DEBIAN_CROSS_BUILD: buildenv-debian-cross
-  FEDORA_BUILD: buildenv-f28
-  FEDORA_X86_BUILD: buildenv-f28-x86
+  FEDORA_BUILD: buildenv-f29
+  DEBIAN_X86_CROSS_BUILD: buildenv-debian-x86-cross
   GET_SOURCES_ATTEMPTS: "3"
 
 # remove any pre-installed headers from nettle
@@ -20,16 +20,6 @@ build/x86-64:
   - shared
   except:
   - tags
-build/x86:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_X86_BUILD
-  script:
-  - ./.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
-  tags:
-  - shared
-  except:
-  - tags
 build/mini-gmp:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
@@ -98,6 +88,22 @@ build/gnutls:
       - gnutls-git/*.log
       - gnutls-git/tests/*/*.log
       - gnutls-git/tests/suite/*/*.log
+Debian.cross.x86:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_X86_CROSS_BUILD
+  before_script:
+  - apt-get remove -y nettle-dev:i386
+  script:
+  - build=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
+  - host=i686-linux-gnu
+  - export CC_FOR_BUILD="gcc"
+  - export CC="$host-gcc"
+  - ./.bootstrap &&
+    CFLAGS="-O2 -g" ./configure --build=$build --host=$host --enable-fat --disable-documentation && make -j4 &&
+    make check -j4
+  tags:
+  - shared
+  except:
+  - tags
 .Debian.cross.template: &Debian_cross_template
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_CROSS_BUILD
   before_script:
-- 
2.19.2

_______________________________________________
nettle-bugs mailing list
[email protected]
http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs

Reply via email to