summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-09-27 13:17:31 +0200
committerVarac <varac@leap.se>2017-09-27 13:17:31 +0200
commite57b1372012849724327e44eac8b28967aa4d581 (patch)
treeed5fd96abbe25333dada001e9c34ca7856696004
parent3318e9c470aa2f4e0f16c14b0ac7d7ffed612f87 (diff)
Fix broken line endings of multiline variable
-rw-r--r--.gitlab-ci.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 745791b..9fdbaad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,9 @@ deploy:
# run ssh-agent
- eval $(ssh-agent -s)
# add ssh key stored in SSH_PRIVATE_KEY variable to the agent store
- - ssh-add <(echo "$SSH_PRIVATE_KEY")
+ # see https://gitlab.com/gitlab-org/gitlab-ee/issues/2940 for fixing
+ # broken line endings
+ - ssh-add <(echo "$SSH_PRIVATE_KEY" | sed 's/\r$//')
script:
- apt-get update
- apt-get install -y --no-install-recommends capistrano