On Sun, Oct 1, 2017 at 11:49 PM, Niels Möller <ni...@lysator.liu.se> wrote:
> Nikos Mavrogiannopoulos <n...@redhat.com> writes:
>
>>> See https://www.lysator.liu.se/~nisse/nettle/plan.html for current
>>> list.
>>
>> (it seems to have a typo and list plan for 3.3)
>
> It seems version number was mentioned in two places, one being wrong.
> Fixed now.
>
>>> armv8-linux-gnu (qemu)
>>> x86_64-freebsd
>>
>> I have already two such systems for gnutls' CI. I could send a patch on
>> .gitlab-ci.yml for nettle to run there too.
>
> That would be great.

Attached is a patch for aarch64 (a runner is already associated with
the gitlab nettle project), and few other patches for .gitlab-ci.yml.
There is some issue with the freebsd addition (the runner is locked to
the gnutls project).

regards,
Nikos
From f384e03272c03e78913cda708b8432c8a2883acc Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <n...@redhat.com>
Date: Thu, 5 Oct 2017 15:27:14 +0200
Subject: [PATCH 1/4] .gitlab-ci.yml: added aarch64 build

Signed-off-by: Nikos Mavrogiannopoulos <n...@redhat.com>
---
 .gitlab-ci.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad6c24fd..a30d31f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ before_script:
  - yum install -y git make autoconf libtool automake gettext-devel glibc-devel gcc valgrind libasan-static libgcc.i686 glibc-devel.i686
 
 # See http://doc.gitlab.com/ce/ci/yaml/ for documentation.
-Build and Check (x86-64):
+build/x86-64:
   script:
   - yum install -y gmp-devel
   - ./.bootstrap &&
@@ -18,7 +18,7 @@ Build and Check (x86-64):
   - shared
   except:
   - tags
-Build and Check (x86):
+build/x86:
   script:
   - yum install -y gmp-devel.i686
   - ./.bootstrap &&
@@ -28,6 +28,19 @@ Build and Check (x86):
   - shared
   except:
   - tags
+build/aarch64:
+  before_script:
+  - /bin/true
+  script:
+  - ./.bootstrap &&
+    ./configure --enable-fat --disable-documentation && make -j4 &&
+    make check -j4
+  tags:
+  - aarch64
+  only:
+  - branches@gnutls/nettle
+  except:
+  - tags
 Build and Check with mini-gmp:
   script:
   - ./.bootstrap &&
-- 
2.11.0

From c65c63799f206eb7afb18d9aa2db100bc52efa1f Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <n...@redhat.com>
Date: Thu, 5 Oct 2017 15:28:15 +0200
Subject: [PATCH 2/4] .gitlab-ci.yml: enable fat builds on x86*

Signed-off-by: Nikos Mavrogiannopoulos <n...@redhat.com>
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a30d31f3..7c30579a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build/x86-64:
   script:
   - yum install -y gmp-devel
   - ./.bootstrap &&
-    ./configure --disable-documentation && make -j4 &&
+    ./configure --enable-fat --disable-documentation && make -j4 &&
     make check -j4
   tags:
   - shared
@@ -22,7 +22,7 @@ build/x86:
   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 --disable-documentation && make -j4 &&
+    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
-- 
2.11.0

From 8ea29590565d2090f1507b6a49c1c1178030aa9c Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <n...@gnutls.org>
Date: Thu, 5 Oct 2017 21:41:06 +0200
Subject: [PATCH 3/4] .gitlab-ci.yml: renamed targets for better overview in
 gitlab pipeline interface

Signed-off-by: Nikos Mavrogiannopoulos <n...@gnutls.org>
---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c30579a..52a89b2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ build/aarch64:
   - branches@gnutls/nettle
   except:
   - tags
-Build and Check with mini-gmp:
+build/mini-gmp:
   script:
   - ./.bootstrap &&
     ./configure --disable-documentation --enable-mini-gmp && make -j4 &&
@@ -50,7 +50,7 @@ Build and Check with mini-gmp:
   - shared
   except:
   - tags
-Build and Check with ubsan:
+build/ubsan:
   image: fedora:25
   script:
   - yum install -y gmp-devel libubsan-static libubsan
@@ -61,7 +61,7 @@ Build and Check with ubsan:
   - shared
   except:
   - tags
-Build and Check with asan:
+build/asan:
   image: fedora:25
   script:
   - yum install -y gmp-devel
@@ -72,7 +72,7 @@ Build and Check with asan:
   - shared
   except:
   - tags
-Build with static-analyzers:
+build/static-analyzers:
   image: fedora:25
   script:
   - yum install -y gmp-devel clang compiler-rt cppcheck clang-analyzer
-- 
2.11.0

From 1bf244676ea05abfb7b2adf9e073ec1690105e29 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <n...@gnutls.org>
Date: Thu, 5 Oct 2017 21:41:30 +0200
Subject: [PATCH 4/4] .gitlab-ci.yml: use fedora 26 build systems

Also removed unused variables.

Signed-off-by: Nikos Mavrogiannopoulos <n...@gnutls.org>
---
 .gitlab-ci.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52a89b2b..6cfc1dcb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,5 @@
 image: centos:7
 
-variables:
-  BUILD_IMAGES_PROJECT: gnutls/build-images
-  FEDORA_BUILD: buildenv-f25
-
 before_script:
  - yum install -y git make autoconf libtool automake gettext-devel glibc-devel gcc valgrind libasan-static libgcc.i686 glibc-devel.i686
 
@@ -51,7 +47,7 @@ build/mini-gmp:
   except:
   - tags
 build/ubsan:
-  image: fedora:25
+  image: fedora:26
   script:
   - yum install -y gmp-devel libubsan-static libubsan
   - ./.bootstrap && 
@@ -62,7 +58,7 @@ build/ubsan:
   except:
   - tags
 build/asan:
-  image: fedora:25
+  image: fedora:26
   script:
   - yum install -y gmp-devel
   - ./.bootstrap && 
@@ -73,7 +69,7 @@ build/asan:
   except:
   - tags
 build/static-analyzers:
-  image: fedora:25
+  image: fedora:26
   script:
   - yum install -y gmp-devel clang compiler-rt cppcheck clang-analyzer
   - ./.bootstrap
-- 
2.11.0

_______________________________________________
nettle-bugs mailing list
nettle-bugs@lists.lysator.liu.se
http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs

Reply via email to