Commit 58efcae2 authored by Erick Hitter's avatar Erick Hitter

Merge branch 'fix/2-rename' into 'master'

Prevent artifact name collisions

Closes #2

See merge request !2
parents a6709988 d157d5da
Pipeline #1126 passed with stages
in 1 minute and 50 seconds
...@@ -7,28 +7,35 @@ before_script: ...@@ -7,28 +7,35 @@ before_script:
- chmod +x nginx-build - chmod +x nginx-build
- ./nginx-build -V - ./nginx-build -V
after_script:
- mkdir -p ${CI_PROJECT_DIR}/${BUILD_DIR}
- mv $CI_PROJECT_DIR/nginx_${NGINX_VERSION}* $BUILD_DIR
- mv $CI_PROJECT_DIR/nginx-dbgsym_* $BUILD_DIR
build-deb:jessie: build-deb:jessie:
stage: build stage: build
image: containers.ethitter.com:443/docker/images/debian:jessie image: containers.ethitter.com:443/docker/images/debian: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
artifacts: artifacts:
paths: paths:
- nginx_${NGINX_VERSION}* - $BUILD_DIR
- nginx-dbgsym_*
test-deb:jessie: 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:
- date - export BUILD_DIR="${CI_PROJECT_DIR}/build-jessie"
script: script:
- dpkg -i nginx_${NGINX_VERSION_JESSIE}*.deb - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_JESSIE}*.deb
- nginx -V - nginx -V
after_script:
- ''
dependencies: dependencies:
- build-deb:jessie - build-deb:jessie
...@@ -38,22 +45,24 @@ build-deb:stretch: ...@@ -38,22 +45,24 @@ 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
artifacts: artifacts:
paths: paths:
- nginx_${NGINX_VERSION}* - $BUILD_DIR
- nginx-dbgsym_*
test-deb:stretch: 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:
- date - export BUILD_DIR="${CI_PROJECT_DIR}/build-stretch"
script: script:
- dpkg -i nginx_${NGINX_VERSION_STRECTH}*.deb - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_STRECTH}*.deb
- nginx -V - nginx -V
after_script:
- ''
dependencies: dependencies:
- build-deb:stretch - build-deb:stretch
...@@ -63,21 +72,23 @@ build-deb:buster: ...@@ -63,21 +72,23 @@ 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
artifacts: artifacts:
paths: paths:
- nginx_${NGINX_VERSION}* - $BUILD_DIR
- nginx-dbgsym_*
test-deb:buster: 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:
- date - export BUILD_DIR="${CI_PROJECT_DIR}/build-buster"
script: script:
- dpkg -i nginx_${NGINX_VERSION_BUSTER}*.deb - dpkg -i ${BUILD_DIR}/nginx_${NGINX_VERSION_BUSTER}*.deb
- nginx -V - nginx -V
after_script:
- ''
dependencies: dependencies:
- build-deb:buster - build-deb:buster
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment