Skip to content

Commit 59b77d0

Browse files
committed
- fix: update SSH key handling in deployment and rollback workflows
1 parent d4ae79e commit 59b77d0

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/deploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
with:
8282
host: ${{ env.SERVER_HOST }}
8383
username: ${{ env.SERVER_USER }}
84-
key: ${{ startsWith(github.ref_name, 'dev-') && secrets.DEV_SERVER_SSH_KEY || secrets.PROD_SERVER_SSH_KEY }}
84+
key_path: "${{ env.HOME }}/.ssh/id_ed25519_github${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}}"
8585
source: "deploy/${{ env.COMPOSE_FILE }}"
8686
target: ${{ env.DEPLOY_PATH }}
8787

@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
host: ${{ env.SERVER_HOST }}
9292
username: ${{ env.SERVER_USER }}
93-
key: ${{ startsWith(github.ref_name, 'dev-') && secrets.DEV_SERVER_SSH_KEY || secrets.PROD_SERVER_SSH_KEY }}
93+
key_path: "${{ env.HOME }}/.ssh/id_ed25519_github${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}}"
9494
source: "deploy/${{ env.NGINX_FILE }}"
9595
target: ${{ env.DEPLOY_PATH }}
9696

@@ -99,7 +99,7 @@ jobs:
9999
with:
100100
host: ${{ env.SERVER_HOST }}
101101
username: ${{ env.SERVER_USER }}
102-
key: ${{ startsWith(github.ref_name, 'dev-') && secrets.DEV_SERVER_SSH_KEY || secrets.PROD_SERVER_SSH_KEY }}
102+
key_path: "${{ env.HOME }}/.ssh/id_ed25519_github${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}}"
103103
script: |
104104
cd ${{ env.DEPLOY_PATH }}
105105
mv deploy/${{ env.COMPOSE_FILE }} ./docker-compose.yml
@@ -109,7 +109,7 @@ jobs:
109109
with:
110110
host: ${{ env.SERVER_HOST }}
111111
username: ${{ env.SERVER_USER }}
112-
key: ${{ startsWith(github.ref_name, 'dev-') && secrets.DEV_SERVER_SSH_KEY || secrets.PROD_SERVER_SSH_KEY }}
112+
key_path: "${{ env.HOME }}/.ssh/id_ed25519_github${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}}"
113113
script: |
114114
cd ${{ env.DEPLOY_PATH }}
115115
mv deploy/${{ env.NGINX_FILE }} ./nginx.conf
@@ -156,7 +156,7 @@ jobs:
156156
with:
157157
host: ${{ env.SERVER_HOST }}
158158
username: ${{ env.SERVER_USER }}
159-
key: ${{ startsWith(github.ref_name, 'dev-') && secrets.DEV_SERVER_SSH_KEY || secrets.PROD_SERVER_SSH_KEY }}
159+
key_path: "${{ env.HOME }}/.ssh/id_ed25519_github${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}}"
160160
script: |
161161
cd ${{ env.DEPLOY_PATH }}
162162

.github/workflows/rollback.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
with:
7272
host: ${{ env.SERVER_HOST }}
7373
username: ${{ env.SERVER_USER }}
74-
key: ${{ github.event.inputs.environment == 'dev' && secrets.DEV_SERVER_SSH_KEY || secrets.PROD_SERVER_SSH_KEY }}
74+
key_path: "${{ env.HOME }}/.ssh/id_ed25519_github${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}}"
7575
script: |
7676
cd ${{ env.DEPLOY_PATH }}
7777
@@ -111,7 +111,7 @@ jobs:
111111
with:
112112
host: ${{ env.SERVER_HOST }}
113113
username: ${{ env.SERVER_USER }}
114-
key: ${{ github.event.inputs.environment == 'dev' && secrets.DEV_SERVER_SSH_KEY || secrets.PROD_SERVER_SSH_KEY }}
114+
key_path: "${{ env.HOME }}/.ssh/id_ed25519_github${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}}"
115115
script: |
116116
cd ${{ env.DEPLOY_PATH }}
117117

0 commit comments

Comments
 (0)