fix build

jonassimoen · Oct 21, 2023 · 0270bcf · 0270bcf
1 parent 83f5ec3
commit 0270bcf
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -17,10 +17,14 @@ jobs:
     steps:
       - name: Setup SSH
         run: |
+          which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y  )
           mkdir -p ~/.ssh
           chmod 700 ~/.ssh
           echo 'echo $SSH_PASSPHRASE' > ~/.ssh/passphrase && chmod 700 ~/.ssh/passphrase
-          SSH_ASKPASS_REQUIRE=force SSH_ASKPASS="/root/.ssh/pass" ssh-add $SSH_PRIVATE_KEY
+          eval $(ssh-agent -s)
+          SSH_ASKPASS_REQUIRE=force SSH_ASKPASS="~/.ssh/passphrase" ssh-add <(echo "$SSH_PRIVATE_KEY" )
+          ssh-keyscan $SERVER_IP >> ~/.ssh/known_hosts
+          chmod 644 ~/.ssh/known_hosts
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
       - run: npm install yarn -g
@@ -30,11 +34,4 @@ jobs:
           yarn build
       - name: Deploy
         run: |
-          which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y  )
-          eval $(ssh-agent -s)
-          cat $SSH_PRIVATE_KEY | tr -d '\r' | DISPLAY=None SSH_ASKPASS=~/.ssh/passphrase ssh-add -
-          mkdir -p ~/.ssh
-          chmod 700 ~/.ssh
-          ssh-keyscan $SERVER_IP >> ~/.ssh/known_hosts
-          chmod 644 ~/.ssh/known_hosts
           scp -r build/* root@$SERVER_IP:/var/www/html/fantasy.simoen.tech/_work/edd-APP/edd-APP/build