From e01619e527656e8c2ad6fb547429d464e9824f2b Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 22 Sep 2021 09:26:35 -0400
Subject: [PATCH] Reformat long line and quote around variable expansion
Quotes required for correct operation if there are spaces or some other
shell-special characters
---
.gitlab-ci.yml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 481c2961..780a3c8a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,13 @@ system-tests:
.update-grid: &UPDATE_GRID
stage: "deploy"
script: |
- env --ignore-environment - NIX_PATH=$NIX_PATH GITLAB_USER_LOGIN=$GITLAB_USER_LOGIN CI_JOB_NAME=$CI_JOB_NAME CI_PIPELINE_SOURCE=$CI_PIPELINE_SOURCE CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH ./ci-tools/update-grid-servers "${PRIVATESTORAGEIO_SSH_DEPLOY_KEY_PATH}" "${CI_ENVIRONMENT_NAME}"
+ env --ignore-environment - \
+ NIX_PATH="$NIX_PATH" \
+ GITLAB_USER_LOGIN="$GITLAB_USER_LOGIN" \
+ CI_JOB_NAME="$CI_JOB_NAME" \
+ CI_PIPELINE_SOURCE="$CI_PIPELINE_SOURCE" \
+ CI_COMMIT_BRANCH="$CI_COMMIT_BRANCH" \
+ ./ci-tools/update-grid-servers "${PRIVATESTORAGEIO_SSH_DEPLOY_KEY_PATH}" "${CI_ENVIRONMENT_NAME}"
# Update the staging deployment - only on a merge to the staging branch.
update-staging:
--
GitLab