Skip to content

Commit

Permalink
chore: Update branch name in CD workflow to use "main" instead of "de…
Browse files Browse the repository at this point in the history
…velop"
  • Loading branch information
castberry10 committed Aug 6, 2024
1 parent 4bb8047 commit 7b609fe
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Deploy to Linux Server

on:
push:
branches: [ develop ]
branches: [ main ]
pull_request:
branches: [ develop ]
branches: [ main ]

jobs:
deploy:
Expand All @@ -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
4 changes: 2 additions & 2 deletions src/app/mypage/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export default function MyPage() {

if (isLoading) return <div>Loading...</div>;
if (isError) return <div>error!</div>;
// if (!data) return <div></div>;

if (!data) return <div>Loading......</div>;
console.log("data: ", data);
console.log(data);
return (
<div className={styles.main}>
Expand Down

0 comments on commit 7b609fe

Please sign in to comment.