Skip to content

Commit 3f7e035

Browse files
committed
fixed secret handling in deployment workflow
1 parent 4a0837d commit 3f7e035

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

.github/workflows/deploy.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,15 @@ jobs:
4747
id: env
4848
run: |
4949
if [ "${{ github.ref }}" == "refs/heads/main" ]; then
50-
echo "SSH_HOST=${{ secrets.SSH_HOST }}" >> $GITHUB_ENV
51-
echo "SSH_USER=${{ secrets.SSH_USER }}" >> $GITHUB_ENV
52-
echo "SSH_PRIVATE_KEY=${{ secrets.SSH_PRIVATE_KEY }}" >> $GITHUB_ENV
53-
echo "SITE_URL=${{ secrets.SITE_URL }}" >> $GITHUB_ENV
54-
echo "BACKEND_URL=${{ secrets.BACKEND_URL }}" >> $GITHUB_ENV
5550
echo "DEPLOY_PATH=${{ secrets.DEPLOY_PATH || '~/processordb-website' }}" >> $GITHUB_ENV
5651
echo "PM2_APP_NAME=ProcessorDB-website" >> $GITHUB_ENV
5752
echo "PM2_PORT=3000" >> $GITHUB_ENV
5853
echo "ECOSYSTEM_FILE=ecosystem.config.js" >> $GITHUB_ENV
5954
else
6055
# For staging, use port from secret or default to 3001 (same instance) or 3000 (separate)
61-
# If using same instance as production, use 3001. If separate instance, use 3000.
62-
# You can override by setting PORT secret in staging environment
6356
DEPLOY_PATH="${{ secrets.DEPLOY_PATH || '~/processordb-website-staging' }}"
6457
STAGING_PORT="${{ secrets.PORT || '3001' }}"
6558
66-
echo "SSH_HOST=${{ secrets.SSH_HOST }}" >> $GITHUB_ENV
67-
echo "SSH_USER=${{ secrets.SSH_USER }}" >> $GITHUB_ENV
68-
echo "SSH_PRIVATE_KEY=${{ secrets.SSH_PRIVATE_KEY }}" >> $GITHUB_ENV
69-
echo "SITE_URL=${{ secrets.SITE_URL }}" >> $GITHUB_ENV
70-
echo "BACKEND_URL=${{ secrets.BACKEND_URL }}" >> $GITHUB_ENV
7159
echo "DEPLOY_PATH=$DEPLOY_PATH" >> $GITHUB_ENV
7260
echo "PM2_APP_NAME=ProcessorDB-website-staging" >> $GITHUB_ENV
7361
echo "PM2_PORT=$STAGING_PORT" >> $GITHUB_ENV
@@ -77,8 +65,8 @@ jobs:
7765
- name: Build application
7866
run: npm run build
7967
env:
80-
SITE_URL: ${{ env.SITE_URL }}
81-
BACKEND_URL: ${{ env.BACKEND_URL }}
68+
SITE_URL: ${{ secrets.SITE_URL }}
69+
BACKEND_URL: ${{ secrets.BACKEND_URL }}
8270

8371
- name: Create staging ecosystem config
8472
if: github.ref != 'refs/heads/main'
@@ -107,12 +95,12 @@ jobs:
10795
- name: Setup SSH
10896
uses: webfactory/[email protected]
10997
with:
110-
ssh-private-key: ${{ env.SSH_PRIVATE_KEY }}
98+
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
11199

112100
- name: Add server to known hosts
113101
run: |
114102
mkdir -p ~/.ssh
115-
ssh-keyscan -H ${{ env.SSH_HOST }} >> ~/.ssh/known_hosts
103+
ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
116104
117105
- name: Deploy to ${{ env.ENVIRONMENT }}
118106
run: |
@@ -121,10 +109,10 @@ jobs:
121109
ECOSYSTEM_FILE="${{ env.ECOSYSTEM_FILE }}"
122110
123111
# Copy files to server
124-
scp -r deploy.tar.gz ${{ env.SSH_USER }}@${{ env.SSH_HOST }}:$DEPLOY_PATH/
112+
scp -r deploy.tar.gz ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:$DEPLOY_PATH/
125113
126114
# SSH into server and deploy
127-
ssh ${{ env.SSH_USER }}@${{ env.SSH_HOST }} "bash -s" << EOF
115+
ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "bash -s" << EOF
128116
set -e
129117
cd $DEPLOY_PATH
130118

0 commit comments

Comments
 (0)