Merge pull request #43 from kogepanh/main

#2 fix ci/cd
Kenny-NISLab · Jul 27, 2021 · 238a9b7 · 238a9b7
2 parents 135053c + ea762e2
commit 238a9b7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,7 +17,7 @@ jobs:
 
       - run: chmod 600 ./aws_lightsail_key
 
-      - run: ssh -o StrictHostKeyChecking=no -i ./aws_lightsail_key ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_HOST }} "cd /var/www/html/mrc && bash scripts/rebuild.sh"
+      - run: ssh -o StrictHostKeyChecking=no -i ./aws_lightsail_key ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_HOST }} "cd /var/www/html/mrc && git pull origin main && bash scripts/rebuild.sh"
 
       - uses: rtCamp/action-slack-notify@v2
         env:

diff --git a/scripts/rebuild.sh b/scripts/rebuild.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-git pull origin main
 yarn install --production
 
 if [ -z "`ps aux | grep "next build" | grep -v grep`" ]; then