Trim newlines from ssh agent eval string (#407)

ccmbioinfo · Jun 4, 2024 · b940339 · b940339
1 parent 0a0a0e4
commit b940339
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/node-prod.yml b/.github/workflows/node-prod.yml
@@ -92,8 +92,10 @@ jobs:
         #
         # https://docs.docker.com/engine/context/working-with-contexts/
         # This avoids passing an -H parameter to every Docker CLI call.
+        #
+        # We use `tr` to trim newlines. GITHUB_OUTPUT doesn't like multi-line strings
         run: |
-          SSH_AGENT_EVAL=$(ssh-agent -s)
+          SSH_AGENT_EVAL=$(ssh-agent -s | tr '\012\015' ' '; echo)
           eval "$SSH_AGENT_EVAL"
           ssh-add - <<< "${{ secrets.DEPLOY_PRIVATE_KEY }}"
           echo "ssh-agent-eval=$SSH_AGENT_EVAL" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -137,8 +137,10 @@ jobs:
         #
         # https://docs.docker.com/engine/context/working-with-contexts/
         # This avoids passing an -H parameter to every Docker CLI call.
+        #
+        # We use `tr` to trim newlines. GITHUB_OUTPUT doesn't like multi-line strings
         run: |
-          SSH_AGENT_EVAL=$(ssh-agent -s)
+          SSH_AGENT_EVAL=$(ssh-agent -s | tr '\012\015' ' '; echo)
           eval "$SSH_AGENT_EVAL"
           ssh-add - <<< "${{ secrets.DEPLOY_PRIVATE_KEY }}"
           echo "ssh-agent-eval=$SSH_AGENT_EVAL" >> $GITHUB_OUTPUT