Skip to content
Snippets Groups Projects
Commit d157d5da authored by Erick Hitter's avatar Erick Hitter
Browse files

Fix build dir pathing

parent 9ca07b99
Branches
No related tags found
1 merge request!2Prevent artifact name collisions
Pipeline #1125 passed
...@@ -8,8 +8,7 @@ before_script: ...@@ -8,8 +8,7 @@ before_script:
- ./nginx-build -V - ./nginx-build -V
after_script: after_script:
- export BUILD_DIR=${CI_PROJECT_DIR}/deb-$(lsb_release -r) - mkdir -p ${CI_PROJECT_DIR}/${BUILD_DIR}
- mkdir $BUILD_DIR
- mv $CI_PROJECT_DIR/nginx_${NGINX_VERSION}* $BUILD_DIR - mv $CI_PROJECT_DIR/nginx_${NGINX_VERSION}* $BUILD_DIR
- mv $CI_PROJECT_DIR/nginx-dbgsym_* $BUILD_DIR - mv $CI_PROJECT_DIR/nginx-dbgsym_* $BUILD_DIR
...@@ -19,6 +18,7 @@ build-deb:jessie: ...@@ -19,6 +18,7 @@ build-deb:jessie:
variables: variables:
NGINX_BINARY: $NGINX_BINARY_JESSIE NGINX_BINARY: $NGINX_BINARY_JESSIE
NGINX_VERSION: $NGINX_VERSION_JESSIE NGINX_VERSION: $NGINX_VERSION_JESSIE
BUILD_DIR: 'build-jessie'
script: script:
- cd source - cd source
- debuild -us -uc - debuild -us -uc
...@@ -30,9 +30,9 @@ test-deb:jessie: ...@@ -30,9 +30,9 @@ test-deb:jessie:
stage: test stage: test
image: containers.ethitter.com:443/docker/images/debian:jessie image: containers.ethitter.com:443/docker/images/debian:jessie
before_script: before_script:
- '' - export BUILD_DIR="${CI_PROJECT_DIR}/build-jessie"
script: script:
- dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_JESSIE}*.deb - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_JESSIE}*.deb
- nginx -V - nginx -V
after_script: after_script:
- '' - ''
...@@ -45,6 +45,7 @@ build-deb:stretch: ...@@ -45,6 +45,7 @@ build-deb:stretch:
variables: variables:
NGINX_BINARY: $NGINX_BINARY_STRETCH NGINX_BINARY: $NGINX_BINARY_STRETCH
NGINX_VERSION: $NGINX_VERSION_STRETCH NGINX_VERSION: $NGINX_VERSION_STRETCH
BUILD_DIR: 'build-stretch'
script: script:
- cd source - cd source
- debuild -us -uc - debuild -us -uc
...@@ -56,9 +57,9 @@ test-deb:stretch: ...@@ -56,9 +57,9 @@ test-deb:stretch:
stage: test stage: test
image: containers.ethitter.com:443/docker/images/debian:stretch image: containers.ethitter.com:443/docker/images/debian:stretch
before_script: before_script:
- '' - export BUILD_DIR="${CI_PROJECT_DIR}/build-stretch"
script: script:
- dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_STRECTH}*.deb - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_STRECTH}*.deb
- nginx -V - nginx -V
after_script: after_script:
- '' - ''
...@@ -71,6 +72,7 @@ build-deb:buster: ...@@ -71,6 +72,7 @@ build-deb:buster:
variables: variables:
NGINX_BINARY: $NGINX_BINARY_BUSTER NGINX_BINARY: $NGINX_BINARY_BUSTER
NGINX_VERSION: $NGINX_VERSION_BUSTER NGINX_VERSION: $NGINX_VERSION_BUSTER
BUILD_DIR: 'build-buster'
script: script:
- cd source - cd source
- debuild -us -uc - debuild -us -uc
...@@ -82,9 +84,9 @@ test-deb:buster: ...@@ -82,9 +84,9 @@ test-deb:buster:
stage: test stage: test
image: containers.ethitter.com:443/docker/images/debian:buster image: containers.ethitter.com:443/docker/images/debian:buster
before_script: before_script:
- '' - export BUILD_DIR="${CI_PROJECT_DIR}/build-buster"
script: script:
- dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_BUSTER}*.deb - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_BUSTER}*.deb
- nginx -V - nginx -V
after_script: after_script:
- '' - ''
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment