From 817dc15f8f16850e8807f2aec8107d05d177f945 Mon Sep 17 00:00:00 2001 From: Matous Holinka Date: Thu, 7 Nov 2019 16:04:25 +0100 Subject: [PATCH] bird: abs. path was updated --- .gitlab-ci.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 942a9320..eea9a695 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,14 +221,16 @@ stages: .build: &build_job stage: build script: - - autoreconf - - ./configure CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" - # Detect which make is available - - MAKE=make - - which gmake 2>/dev/null >/dev/null && MAKE=gmake - - $MAKE - # Run tests if they are available - - $MAKE check + - DIR=$(pwd) + - autoreconf + - ./configure CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" + # Detect which make is available + - MAKE=make + - which gmake 2>/dev/null >/dev/null && MAKE=gmake + - $MAKE + # Run tests if they are available + - $MAKE check + - mv $DIR/bird $DIR/birdc /var/lib/gitlab-runner/ # build-debian-7-amd64: # <<: *debian-7-amd64_env @@ -297,11 +299,11 @@ stages: build-birdlab: <<: *build_job script: - - DIR=$(pwd) + #- DIR=$(pwd) - cd /var/lib/gitlab-runner/bird-tools - sudo git clean -fx - git pull --ff-only - - mv $DIR/bird $DIR/birdc /var/lib/gitlab-runner/bird-tools/netlab-int/common + - mv /var/lib/gitlab-runner/bird /var/lib/gitlab-runner/birdc /var/lib/gitlab-runner/bird-tools/netlab-int/common tags: - birdlab - amd64