Skip to content

Commit

Permalink
Merge: branch 'main' into feat/#34
Browse files Browse the repository at this point in the history
  • Loading branch information
Zamoca42 committed Feb 22, 2024
2 parents fdae246 + ce52ad8 commit c6b2d2f
Show file tree
Hide file tree
Showing 179 changed files with 9,915 additions and 23,236 deletions.
22 changes: 3 additions & 19 deletions .github/workflows/client-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,17 @@ on:
push:
branches: [feat/*]
paths:
- "frontend/**"
- "packages/frontend/**"

jobs:
lint:
runs-on: ubuntu-latest

defaults:
run:
working-directory: "frontend"

strategy:
matrix:
node-version: [16.x, 21.x]

steps:
- name: 코드 체크아웃
uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
uses: actions/checkout@v4

- name: npm install
run: npm install

- name: lint
run: npm run lint

- name: tsc
run: tsc
run: npm run lint -w packages/frontend
8 changes: 4 additions & 4 deletions .github/workflows/client-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:

defaults:
run:
working-directory: "frontend"
working-directory: "packages/frontend"

steps:
- name: 코드 체크아웃
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: AWS IAM 사용자 설정
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -29,7 +29,7 @@ jobs:
npm run build
- name: 빌드한 파일 S3에 업로드
run: aws s3 sync build/ s3://${{ secrets.AWS_S3_BUCKET }} --acl public-read
run: aws s3 sync dist/ s3://${{ secrets.AWS_S3_BUCKET }} --acl public-read
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/server-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@ on:
push:
branches: [feat/*]
paths:
- 'backend/**'
- 'packages/backend/**'

jobs:
test:
runs-on: ubuntu-latest
defaults:
run:
working-directory: "backend"
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -20,13 +17,10 @@ jobs:
run: npm install

- name: Run Tests with Coverage
run: npm run test:cov
run: npm run test:cov -w packages/backend

lint:
runs-on: ubuntu-latest
defaults:
run:
working-directory: "backend"
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -35,4 +29,4 @@ jobs:
run: npm install

- name: Run Lint
run: npm run lint
run: npm run lint -w packages/backend
2 changes: 1 addition & 1 deletion .github/workflows/server-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

defaults:
run:
working-directory: "backend"
working-directory: "packages/backend"

steps:
- name: Checkout code
Expand Down
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,13 @@ $RECYCLE.BIN/
# Windows shortcuts
*.lnk

# End of https://www.toptal.com/developers/gitignore/api/macos,windows,node
# End of https://www.toptal.com/developers/gitignore/api/macos,windows,node

# Backend Ignore

backend/static
backend/generated

# Frontend Ignore

build
51 changes: 0 additions & 51 deletions backend/src/auth/auth.service.ts

This file was deleted.

Loading

0 comments on commit c6b2d2f

Please sign in to comment.