0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 02:01:55 +00:00

bird: ubuntu 18.04 minor update

This commit is contained in:
Matous Holinka 2019-11-13 10:42:10 +01:00
parent 1208e97066
commit 4a61253f2a

View File

@ -106,10 +106,10 @@ stages:
# IMG_NAME: "fedora-29-amd64" # IMG_NAME: "fedora-29-amd64"
# <<: *docker_build # <<: *docker_build
docker_fedora-30-amd64: # docker_fedora-30-amd64:
variables: # variables:
IMG_NAME: "fedora-30-amd64" # IMG_NAME: "fedora-30-amd64"
<<: *docker_build # <<: *docker_build
# docker_fedora-31-amd64: # docker_fedora-31-amd64:
# variables: # variables:
@ -141,10 +141,10 @@ docker_fedora-30-amd64:
# IMG_NAME: "ubuntu-16.04-amd64" # IMG_NAME: "ubuntu-16.04-amd64"
# <<: *docker_build # <<: *docker_build
# docker_ubuntu-18_04-amd64: docker_ubuntu-18_04-amd64:
# variables: variables:
# IMG_NAME: "ubuntu-18.04-amd64" IMG_NAME: "ubuntu-18.04-amd64"
# <<: *docker_build <<: *docker_build
# docker_ubuntu-19_04-amd64: # docker_ubuntu-19_04-amd64:
# variables: # variables:
@ -157,8 +157,8 @@ docker_fedora-30-amd64:
- autoreconf - autoreconf
- ./configure CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" - ./configure CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
# Detect which make is available # Detect which make is available
- MAKE=gmake - MAKE=make
#- which gmake 2>/dev/null >/dev/null && MAKE=gmake - which gmake 2>/dev/null >/dev/null && MAKE=gmake
- $MAKE - $MAKE
# Run tests if they are available # Run tests if they are available
- $MAKE check - $MAKE check
@ -230,9 +230,9 @@ docker_fedora-30-amd64:
# <<: *build-linux # <<: *build-linux
# image: registry.labs.nic.cz/labs/bird:fedora-29-amd64 # image: registry.labs.nic.cz/labs/bird:fedora-29-amd64
build-fedora-30-amd64: # build-fedora-30-amd64:
<<: *build-linux # <<: *build-linux
image: registry.labs.nic.cz/labs/bird:fedora-30-amd64 # image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
# build-fedora-31-amd64: # build-fedora-31-amd64:
# <<: *build-linux # <<: *build-linux
@ -258,9 +258,9 @@ build-fedora-30-amd64:
# <<: *build-linux # <<: *build-linux
# image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64 # image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64
# build-ubuntu-18_04-amd64: build-ubuntu-18_04-amd64:
# <<: *build-linux <<: *build-linux
# image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64 image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64
# build-ubuntu-19_04-amd64: # build-ubuntu-19_04-amd64:
# <<: *build-linux # <<: *build-linux