From 397b63772973e6ebde6c75a987378015b03ded91 Mon Sep 17 00:00:00 2001
From: colinlyguo <colinlyguo@scroll.io>
Date: Wed, 14 May 2025 19:02:31 +0800
Subject: [PATCH] fix CI

---
 .github/workflows/common.yml | 16 +++++++++++-----
 .github/workflows/docker.yml | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 204756f9a..f80e1f109 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -42,13 +42,19 @@ jobs:
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: "common/libzkp/impl -> target"
-    - name: Setup SSH for private repositories
+    - name: Combine all deploy keys
+      run: |
+        echo "${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }}" > key1
+        echo "${{ secrets.OPENVM_STARK_GPU_SSH_PRIVATE_KEY }}" > key2
+        echo "${{ secrets.PLONKY3_GPU_SSH_PRIVATE_KEY }}" > key3
+        cat key1 key2 key3 > all_keys
+        chmod 600 all_keys
+    - name: Setup SSH Agent
       uses: webfactory/ssh-agent@v0.9.0
       with:
-        ssh-private-key: |
-          ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }}
-          ${{ secrets.OPENVM_STARK_GPU_SSH_PRIVATE_KEY }}
-          ${{ secrets.PLONKY3_GPU_SSH_PRIVATE_KEY }}
+        ssh-private-key: ${{ steps.setup-keys.outputs.keys }}
+      env:
+        SSH_PRIVATE_KEY: ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} # just for syntax correctness
     - name: Lint
       working-directory: 'common'
       run: |
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4b1417963..35398a3ce 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -307,13 +307,19 @@ jobs:
           REPOSITORY: coordinator-api
         run: |
           aws --region ${{ env.AWS_REGION }} ecr describe-repositories --repository-names ${{ env.REPOSITORY }} && : || aws --region ${{ env.AWS_REGION }} ecr create-repository --repository-name ${{ env.REPOSITORY }}
-      - name: Setup SSH for private repositories
+      - name: Combine all deploy keys
+        run: |
+          echo "${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }}" > key1
+          echo "${{ secrets.OPENVM_STARK_GPU_SSH_PRIVATE_KEY }}" > key2
+          echo "${{ secrets.PLONKY3_GPU_SSH_PRIVATE_KEY }}" > key3
+          cat key1 key2 key3 > all_keys
+          chmod 600 all_keys
+      - name: Setup SSH Agent
         uses: webfactory/ssh-agent@v0.9.0
         with:
-          ssh-private-key: |
-            ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }}
-            ${{ secrets.OPENVM_STARK_GPU_SSH_PRIVATE_KEY }}
-            ${{ secrets.PLONKY3_GPU_SSH_PRIVATE_KEY }}
+          ssh-private-key: ${{ steps.setup-keys.outputs.keys }}
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} # just for syntax correctness
       - name: Run custom script
         run: |
           ./build/dockerfiles/coordinator-api/init-openvm.sh