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

Merge branch 'add/artifact-naming' into 'master'

Improve artifact naming

See merge request !2
parents cf1072a8 4b89853e
No related branches found
No related tags found
1 merge request!2Improve artifact naming
Pipeline #570 passed
...@@ -27,6 +27,6 @@ build_nginx: ...@@ -27,6 +27,6 @@ build_nginx:
- ./scripts/build.sh - ./scripts/build.sh
artifacts: artifacts:
paths: paths:
- src/nginx/objs/nginx - artifacts
only: only:
- master - master
...@@ -14,6 +14,14 @@ echo "$OG_DIR" ...@@ -14,6 +14,14 @@ echo "$OG_DIR"
echo "" echo ""
# Common paths. # 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" NGINX_SRC_DIR="$OG_DIR/src/nginx"
export NGINX_SRC_DIR export NGINX_SRC_DIR
...@@ -103,6 +111,7 @@ if [[ ! -f "$NGINX_SRC_DIR/objs/nginx" ]]; then ...@@ -103,6 +111,7 @@ if [[ ! -f "$NGINX_SRC_DIR/objs/nginx" ]]; then
exit 1 exit 1
fi fi
# Verify build works cd "$NGINX_SRC_DIR/objs"
cd "$NGINX_SRC_DIR/objs" || exit 1
./nginx -V ./nginx -V
cp "$NGINX_SRC_DIR/objs/nginx" "$NGINX_BUILT_BINARY_PATH"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment