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

bird: minor update

This commit is contained in:
Matous Holinka 2019-11-13 10:14:26 +01:00
parent 524246f187
commit 81254013ea

View File

@ -107,10 +107,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:
@ -122,10 +122,10 @@ stages:
# IMG_NAME: "centos-7-amd64" # IMG_NAME: "centos-7-amd64"
# <<: *docker_build # <<: *docker_build
docker_centos-8-amd64: # docker_centos-8-amd64:
variables: # variables:
IMG_NAME: "centos-8-amd64" # IMG_NAME: "centos-8-amd64"
<<: *docker_build # <<: *docker_build
# docker_opensuse-42_3-amd64: # docker_opensuse-42_3-amd64:
# variables: # variables:
@ -231,9 +231,9 @@ docker_centos-8-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
@ -243,9 +243,9 @@ docker_centos-8-amd64:
# <<: *build-linux # <<: *build-linux
# image: registry.labs.nic.cz/labs/bird:centos-7-amd64 # image: registry.labs.nic.cz/labs/bird:centos-7-amd64
build-centos-8-amd64: # build-centos-8-amd64:
<<: *build-linux # <<: *build-linux
image: registry.labs.nic.cz/labs/bird:centos-8-amd64 # image: registry.labs.nic.cz/labs/bird:centos-8-amd64
# build-opensuse-42_3-amd64: # build-opensuse-42_3-amd64:
# <<: *build-linux # <<: *build-linux
@ -279,20 +279,20 @@ build-centos-8-amd64:
# - freebsd # - freebsd
# - i386 # - i386
build-birdlab: # build-birdlab:
stage: build # stage: build
tags: # tags:
- birdlab # - birdlab
- amd64 # - amd64
script: # script:
- DIR=$(pwd) # - DIR=$(pwd)
- autoreconf # - autoreconf
- ./configure # - ./configure
- make # - make
- cd $TOOLS_DIR # - cd $TOOLS_DIR
- sudo git clean -fx # - sudo git clean -fx
- git pull --ff-only # - git pull --ff-only
- mv $DIR/bird $DIR/birdc netlab/common # - mv $DIR/bird $DIR/birdc netlab/common
# .test: &test-base # .test: &test-base