Commit 7e00a2d1 authored by Nikos Mavrogiannopoulos's avatar Nikos Mavrogiannopoulos Committed by Niels Möller

.gitlab-ci.yml: updated to new images by gnutls

Signed-off-by: default avatarNikos Mavrogiannopoulos <nmav@redhat.com>
parent 2767ebce
variables: variables:
BUILD_IMAGES_PROJECT: gnutls/build-images BUILD_IMAGES_PROJECT: gnutls/build-images
DEBIAN_CROSS_BUILD: buildenv-debian-cross DEBIAN_CROSS_BUILD: buildenv-debian-cross
FEDORA_BUILD: buildenv-f28 FEDORA_BUILD: buildenv-f29
FEDORA_X86_BUILD: buildenv-f28-x86 DEBIAN_X86_CROSS_BUILD: buildenv-debian-x86-cross
GET_SOURCES_ATTEMPTS: "3" GET_SOURCES_ATTEMPTS: "3"
# remove any pre-installed headers from nettle # remove any pre-installed headers from nettle
...@@ -20,16 +20,6 @@ build/x86-64: ...@@ -20,16 +20,6 @@ build/x86-64:
- shared - shared
except: except:
- tags - 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: build/mini-gmp:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script: script:
...@@ -98,6 +88,22 @@ build/gnutls: ...@@ -98,6 +88,22 @@ build/gnutls:
- gnutls-git/*.log - gnutls-git/*.log
- gnutls-git/tests/*/*.log - gnutls-git/tests/*/*.log
- gnutls-git/tests/suite/*/*.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 .Debian.cross.template: &Debian_cross_template
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_CROSS_BUILD image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_CROSS_BUILD
before_script: before_script:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment