diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 480e391..51296e8 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -2,9 +2,9 @@ name: Deploy to Linux Server on: push: - branches: [ develop ] + branches: [ main ] pull_request: - branches: [ develop ] + branches: [ main ] jobs: deploy: @@ -26,6 +26,7 @@ jobs: sshpass -p $SSH_PASSWORD ssh -o StrictHostKeyChecking=no -p $SSH_PORT castberry@$SSH_IP << 'EOF' cd /home/castberry/dailypet git pull + git checkout main npm install pm2 restart dailypet-dev || pm2 start npm --name "dailypet-dev" -- run start EOF diff --git a/src/app/mypage/page.tsx b/src/app/mypage/page.tsx index fd77eeb..0e7975e 100644 --- a/src/app/mypage/page.tsx +++ b/src/app/mypage/page.tsx @@ -9,8 +9,8 @@ export default function MyPage() { if (isLoading) return
Loading...
; if (isError) return
error!
; - // if (!data) return
; - + if (!data) return
Loading......
; + console.log("data: ", data); console.log(data); return (