Skip to content

Commit

Permalink
Merge f6a0cd1 into 67027db
Browse files Browse the repository at this point in the history
  • Loading branch information
NaGyeong-Park authored Dec 15, 2022
2 parents 67027db + f6a0cd1 commit ea05329
Show file tree
Hide file tree
Showing 125 changed files with 6,039 additions and 957 deletions.
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/Bug-Report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@ description: 기능 개선을 위해 버그를 제보해주세요.
title: "fix: "
labels: ["bug"]
body:
- type: dropdown
attributes:
label: 심각성
description: 해당 버그가 서비스에 미치는 영향의 심각성을 평가해 주세요.
multiple: false
options:
- A
- B
- C
validations:
required: true
- type: textarea
attributes:
label: 버그 설명
Expand Down
63 changes: 63 additions & 0 deletions .github/ISSUE_TEMPLATE/Feature-Request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: 피처 요청 템플릿
description: 서비스에 필요한 새로운 피처 명세를 작성하고 개발자에게 요청하세요.
title: "request: "
labels: ["request"]
body:
- type: input
attributes:
label: 피처 개요
description: 필요한 피처에 대해서 한줄로 설명해주세요.
validations:
required: true
- type: textarea
attributes:
label: 요청 사유
description: 해당 피처가 필요한 이유, 필요한 상황에 대해서 기술해주세요.
validations:
required: true
- type: dropdown
attributes:
label: 중요도
description: 해당 피처의 중요도를 선택해주세요.
multiple: false
options:
- A
- B
- C
validations:
required: true
- type: dropdown
attributes:
label: 난이도
description: 해당 피처의 구현 난이도(구현 시간도 고려하여)을 선택해주세요.
multiple: false
options:
-
-
-
validations:
required: true
- type: textarea
attributes:
label: 피처 설명
description: 필요한 피처에 대해서 자세히 설명해주세요.
validations:
required: false
- type: textarea
attributes:
label: 체크리스트
description: 작업에 필요한 마이크로 피처들을 작성해 이슈를 링크해주세요.
validations:
required: false
- type: input
attributes:
label: 관련 정보
description: 관련된 Project Wiki 페이지가 있다면 링크해주세요.
validations:
required: false
- type: checkboxes
attributes:
label: 담당자 지정
options:
- label: assignee에 담당자를 제대로 지정하였나요?
required: true
28 changes: 25 additions & 3 deletions .github/ISSUE_TEMPLATE/Feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,32 @@ description: 피처 구현을 위한 이슈를 작성하세요.
title: "feat: "
labels: ["feature"]
body:
- type: textarea
- type: input
attributes:
label: 피처 개요
description: 필요한 피처에 대해서 간단히 설명해주세요.
description: 필요한 피처에 대해서 한줄로 설명해주세요.
validations:
required: true
- type: dropdown
attributes:
label: 중요도
description: 해당 피처의 중요도를 선택해주세요.
multiple: false
options:
- A
- B
- C
validations:
required: true
- type: dropdown
attributes:
label: 난이도
description: 해당 피처의 구현 난이도(구현 시간도 고려하여)을 선택해주세요.
multiple: false
options:
-
-
-
validations:
required: true
- type: textarea
Expand All @@ -26,4 +48,4 @@ body:
label: 관련 정보
description: 관련된 Project Wiki 페이지가 있다면 링크해주세요.
validations:
required: false
required: false
16 changes: 6 additions & 10 deletions .github/pull-request-template.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<!-- 제목형식 FEAT: 내용 -->
## 개요
무엇에 관한 내용인지

## 세부 내용
- A
- description
- screenshot
- B
- 변경 전
- 변경 후
- C

## 공유

- 고민과 질문

- 해결 과정의 기록은 정리해서 위키에 수록 후 링크 달기
## relevant issue number

## 관련 이슈

- 관련된 이슈 넘버가 있으면 이곳에 기입해주세요
28 changes: 25 additions & 3 deletions .github/workflows/CLIENT_BUILD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Runner 타임존 설정
run: |
sudo timedatectl set-timezone 'Asia/Seoul'
- name: Node 설정
uses: actions/setup-node@v1
with:
Expand All @@ -30,6 +34,25 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: yarn

- name: 테스트 실행
working-directory: ./client
run: |
yarn -s test
- name: 테스트 결과 발행
uses: n-ryu/[email protected]
if: always()
with:
name: JEST Tests
path: client/reports/*.xml
reporter: jest-junit

- name: Code Coverage 리포트 발행
if: always()
uses: codecov/codecov-action@v3
with:
flags: unittests

- name: Client 소스 빌드
working-directory: "./client"
run: yarn build
Expand Down Expand Up @@ -61,7 +84,7 @@ jobs:
username: ${{ secrets.RELEASE_USERNAME }}
password: ${{ secrets.RELEASE_PASSWORD }}
port: ${{ secrets.RELEASE_PORT }}
source: "docker-compose.yml"
source: "docker-compose.production.yml"
target: "oao"

- name: 운영 서버에서 Docker Compose 실행
Expand All @@ -74,11 +97,10 @@ jobs:
script: |
echo ${{secrets.CONTAINER_REGISTRY_TOKEN}} | docker login ghcr.io -u kumsil1006 --password-stdin
docker pull ghcr.io/kumsil1006/oao-client
docker pull ghcr.io/kumsil1006/oao-proxy
cd oao
docker-compose up -d
docker-compose -f docker-compose.production.yml up -d
docker image prune
- name: 실패시 슬랙 메시지 전송
Expand Down
30 changes: 26 additions & 4 deletions .github/workflows/CLIENT_DEV_BUILD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
branches:
- main

paths:
- "client/**"

Expand All @@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Runner 타임존 설정
run: |
sudo timedatectl set-timezone 'Asia/Seoul'
- name: Node 설정
uses: actions/setup-node@v1
with:
Expand All @@ -31,6 +35,25 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: yarn

- name: 테스트 실행
working-directory: ./client
run: |
yarn -s test
- name: 테스트 결과 발행
uses: n-ryu/[email protected]
if: always()
with:
name: JEST Tests
path: client/reports/*.xml
reporter: jest-junit

- name: Code Coverage 리포트 발행
if: always()
uses: codecov/codecov-action@v3
with:
flags: unittests

- name: Client 소스 build
working-directory: "./client"
run: yarn build
Expand All @@ -49,7 +72,7 @@ jobs:
tags: ghcr.io/kumsil1006/oao-dev-client
context: ./client

- name: Docker Compose 파일 운영 서버로 복사
- name: Docker Compose 파일 개발 서버로 복사
uses: appleboy/scp-action@master
with:
host: ${{ secrets.ANOTHER_HOST }}
Expand All @@ -59,7 +82,7 @@ jobs:
source: "docker-compose.yml"
target: "oao"

- name: 운영 서버에서 Docker Compose 실행
- name: 개발 서버에서 Docker Compose 실행
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.ANOTHER_HOST }}
Expand All @@ -69,7 +92,6 @@ jobs:
script: |
echo ${{secrets.CONTAINER_REGISTRY_TOKEN}} | docker login ghcr.io -u kumsil1006 --password-stdin
docker pull ghcr.io/kumsil1006/oao-dev-client
docker pull ghcr.io/kumsil1006/oao-dev-proxy
cd oao
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/PRODUCTION_RELEASE.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release Github Application Version
name: Release Github Application Version Update
on:
pull_request:
branches:
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/PROXY_BUILD.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Proxy Dockerfile Build
on:
pull_request:
branches:
- release
paths:
- "nginx/Dockerfile.production"

jobs:
proxy-build:
name: proxy-build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: GitHub Container Registry 로그인
uses: docker/login-action@v1
with:
registry: ghcr.io
username: kumsil1006
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}

- name: Docker images build 및 GitHub Container Registry로 push
uses: docker/[email protected]
with:
push: true
tags: ghcr.io/kumsil1006/oao-proxy
context: ./nginx
file: ./nginx/Dockerfile.production

- name: Docker Compose 파일 운영 서버로 복사
uses: appleboy/scp-action@master
with:
host: ${{ secrets.RELEASE_HOST }}
username: ${{ secrets.RELEASE_USERNAME }}
password: ${{ secrets.RELEASE_PASSWORD }}
port: ${{ secrets.RELEASE_PORT }}
source: "docker-compose.production.yml"
target: "oao"

- name: 운영 서버에서 Docker Compose 실행
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.RELEASE_HOST }}
username: ${{ secrets.RELEASE_USERNAME }}
password: ${{ secrets.RELEASE_PASSWORD }}
port: ${{ secrets.RELEASE_PORT }}
script: |
echo ${{secrets.CONTAINER_REGISTRY_TOKEN}} | docker login ghcr.io -u kumsil1006 --password-stdin
docker pull ghcr.io/kumsil1006/oao-proxy
cd oao
docker-compose -f docker-compose.production.yml up -d
docker image prune
- name: 실패시 슬랙 메시지 전송
if: ${{ failure() }}
uses: ./.github/actions/slack-notify
with:
slack_incoming_url: ${{ secrets.SLACK_INCOMING_URL }}

- name: 성공시 슬랙 메시지 전송
if: ${{ success() }}
uses: ./.github/actions/slack-notify
with:
status: success
slack_incoming_url: ${{ secrets.SLACK_INCOMING_URL }}
Loading

0 comments on commit ea05329

Please sign in to comment.