diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2019-01-02 10:31:08 +0100 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2019-01-12 17:38:24 +0100 |
| commit | 7e00a2d174385903c2f187ecb54118ec4f4d390d (patch) | |
| tree | c1874c1bdf4a6334f7677752817b3ffad188761d | |
| parent | 2767ebce0861775dd54b9a71e25c13fbbedc3f4a (diff) | |
| download | nettle-7e00a2d174385903c2f187ecb54118ec4f4d390d.tar.gz | |
.gitlab-ci.yml: updated to new images by gnutls
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 30 |
1 files 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: |