From cb3f9cbee854b5d41943ac702a8ca8bc8b574216 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 23 Feb 2019 19:24:48 -0800
Subject: [PATCH] Include build arguments in artifact name
---
.gitlab-ci.yml | 2 +-
scripts/build.sh | 14 ++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03588d7..7f0d820 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 7e3d41c..7a505e2 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,8 @@ if [[ ! -f "$NGINX_SRC_DIR/objs/nginx" ]]; then
exit 1
fi
+cp "$NGINX_SRC_DIR/objs/nginx" "$NGINX_BUILT_BINARY_PATH"
+
# Verify build works
-cd "$NGINX_SRC_DIR/objs" || exit 1
-./nginx -V
+cd "$NGINX_ARTIFACT_PATH" || exit 1
+./"$NGINX_BUILT_BINARY_PATH" -V
--
GitLab