From e57b1372012849724327e44eac8b28967aa4d581 Mon Sep 17 00:00:00 2001
From: Varac <varac@leap.se>
Date: Wed, 27 Sep 2017 13:17:31 +0200
Subject: Fix broken line endings of multiline variable

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3