Skip to content

Commit

Permalink
Merge branch 'main' into boilerPlate
Browse files Browse the repository at this point in the history
  • Loading branch information
ChanghyeonO authored Jan 22, 2024
2 parents d2f6ad9 + 373f21b commit 72eac7a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: CI/CD
on:
push:
branches:
- boilerPlate
- main

# ์ž‘์—… ์ •์˜
jobs:
Expand Down Expand Up @@ -53,5 +53,5 @@ jobs:
run: |
aws s3 sync \
--region ap-northeast-2 \
build s3://petree-front\
build s3://nextpetree.store\
--delete
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,4 @@ npm run start
</table>

<br>
<br>
<br>
1 change: 1 addition & 0 deletions tsconfig.paths.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"@api/*": ["./api/*"],
"@assets/*": ["./assets/*"],
"@component/*": ["./component/*"],
"@constant/*": ["./constant/*"],
"@hooks/*": ["./hooks/*"],
"@pages/*": ["./pages/*"],
"@routes/*": ["./routes/*"],
Expand Down

0 comments on commit 72eac7a

Please sign in to comment.