From d157d5da451973a2d956e002890d389b7f9887b4 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Mon, 27 May 2019 21:31:19 -0700
Subject: [PATCH] Fix build dir pathing
---
.gitlab-ci.yml | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d33fe32..cd92e06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,7 @@ before_script:
- ./nginx-build -V
after_script:
- - export BUILD_DIR=${CI_PROJECT_DIR}/deb-$(lsb_release -r)
- - mkdir $BUILD_DIR
+ - mkdir -p ${CI_PROJECT_DIR}/${BUILD_DIR}
- mv $CI_PROJECT_DIR/nginx_${NGINX_VERSION}* $BUILD_DIR
- mv $CI_PROJECT_DIR/nginx-dbgsym_* $BUILD_DIR
@@ -19,6 +18,7 @@ build-deb:jessie:
variables:
NGINX_BINARY: $NGINX_BINARY_JESSIE
NGINX_VERSION: $NGINX_VERSION_JESSIE
+ BUILD_DIR: 'build-jessie'
script:
- cd source
- debuild -us -uc
@@ -30,9 +30,9 @@ test-deb:jessie:
stage: test
image: containers.ethitter.com:443/docker/images/debian:jessie
before_script:
- - ''
+ - export BUILD_DIR="${CI_PROJECT_DIR}/build-jessie"
script:
- - dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_JESSIE}*.deb
+ - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_JESSIE}*.deb
- nginx -V
after_script:
- ''
@@ -45,6 +45,7 @@ build-deb:stretch:
variables:
NGINX_BINARY: $NGINX_BINARY_STRETCH
NGINX_VERSION: $NGINX_VERSION_STRETCH
+ BUILD_DIR: 'build-stretch'
script:
- cd source
- debuild -us -uc
@@ -56,9 +57,9 @@ test-deb:stretch:
stage: test
image: containers.ethitter.com:443/docker/images/debian:stretch
before_script:
- - ''
+ - export BUILD_DIR="${CI_PROJECT_DIR}/build-stretch"
script:
- - dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_STRECTH}*.deb
+ - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_STRECTH}*.deb
- nginx -V
after_script:
- ''
@@ -71,6 +72,7 @@ build-deb:buster:
variables:
NGINX_BINARY: $NGINX_BINARY_BUSTER
NGINX_VERSION: $NGINX_VERSION_BUSTER
+ BUILD_DIR: 'build-buster'
script:
- cd source
- debuild -us -uc
@@ -82,9 +84,9 @@ test-deb:buster:
stage: test
image: containers.ethitter.com:443/docker/images/debian:buster
before_script:
- - ''
+ - export BUILD_DIR="${CI_PROJECT_DIR}/build-buster"
script:
- - dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_BUSTER}*.deb
+ - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_BUSTER}*.deb
- nginx -V
after_script:
- ''
--
GitLab