diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03588d7da7c602fa16dd29d87bfe1b56b0de643b..7f0d82097ad7c450f9daa9eaaf6d28fdfbe16896 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,6 @@ build_nginx: - ./scripts/build.sh artifacts: paths: - - src/nginx/objs/nginx + - artifacts only: - master diff --git a/scripts/build.sh b/scripts/build.sh index 7e3d41c2ac4a4c95e7d2a1b75aa8ad84f397b0e4..13305df0b621ada911131f8781709963fa7dd8e4 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -14,6 +14,14 @@ echo "$OG_DIR" echo "" # Common paths. +NGINX_ARTIFACT_PATH="$OG_DIR/artifacts" +export NGINX_ARTIFACT_PATH + +NGINX_BUILT_BINARY_PATH="$NGINX_ARTIFACT_PATH/nginx_${NGINX_TAG}_${OPENSSL_TAG}" +export NGINX_BUILT_BINARY_PATH + +mkdir -p "$NGINX_ARTIFACT_PATH" + NGINX_SRC_DIR="$OG_DIR/src/nginx" export NGINX_SRC_DIR @@ -103,6 +111,7 @@ if [[ ! -f "$NGINX_SRC_DIR/objs/nginx" ]]; then exit 1 fi -# Verify build works -cd "$NGINX_SRC_DIR/objs" || exit 1 +cd "$NGINX_SRC_DIR/objs" ./nginx -V + +cp "$NGINX_SRC_DIR/objs/nginx" "$NGINX_BUILT_BINARY_PATH"