Commit 1969c325 authored by Erick Hitter's avatar Erick Hitter

Merge branch 'add/stretch' into 'master'

Stretch build

See merge request !3
parents 9ad55a6b e4578506
Pipeline #578 passed with stages
in 5 minutes and 44 seconds
image: containers.ethitter.com:443/docker/images/debian:jessie
stages:
- test_pre_build
- build
- test
- deploy
# General tests
test_build_script:
stage: test_pre_build
image: koalaman/shellcheck-alpine:latest
script:
- shellcheck ./scripts/build.sh
test_build_nginx:
# Stretch
test_build_nginx_stretch:
stage: build
image: containers.ethitter.com:443/docker/images/debian:stretch
script:
- chmod +x ./scripts/build.sh
- ./scripts/build.sh
except:
- master
build_nginx_stretch:
stage: build
image: containers.ethitter.com:443/docker/images/debian:stretch
script:
- chmod +x ./scripts/build.sh
- ./scripts/build.sh
artifacts:
paths:
- artifacts
only:
- master
# Jessie
test_build_nginx_jessie:
stage: build
image: containers.ethitter.com:443/docker/images/debian:jessie
script:
- chmod +x ./scripts/build.sh
- ./scripts/build.sh
except:
- master
build_nginx:
build_nginx_jessie:
stage: build
image: containers.ethitter.com:443/docker/images/debian:jessie
script:
- chmod +x ./scripts/build.sh
- ./scripts/build.sh
......
......@@ -17,7 +17,7 @@ echo ""
NGINX_ARTIFACT_PATH="$OG_DIR/artifacts"
export NGINX_ARTIFACT_PATH
NGINX_BUILT_BINARY_PATH="$NGINX_ARTIFACT_PATH/nginx_${NGINX_TAG}_${OPENSSL_TAG}"
NGINX_BUILT_BINARY_PATH="${NGINX_ARTIFACT_PATH}/nginx_$(lsb_release -sc)_${NGINX_TAG}_${OPENSSL_TAG}"
export NGINX_BUILT_BINARY_PATH
mkdir -p "$NGINX_ARTIFACT_PATH"
......@@ -104,7 +104,6 @@ cd "$NGINX_SRC_DIR" || exit 1
# Build nginx
echo ""
echo "BUILDING NGINX"
echo "Using $(nproc) jobs"
make
if [[ ! -f "$NGINX_SRC_DIR/objs/nginx" ]]; then
......
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