From f2259e6785fa6b53c01ac5a51eca0618f783f152 Mon Sep 17 00:00:00 2001 From: minsoo kim Date: Fri, 29 Oct 2021 00:33:49 +0900 Subject: [PATCH 1/5] [docs] [SETB-39] add commit convention --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index cb6144d..fda41cb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,20 @@ # Space Invaders +## Convention + +### Commit Convention + +- task 하나 : 하나의 브랜치 = 1 : 1 로 작업을 한다. +- task 의 하위 이슈(하위 작업)가 생길 경우 브랜치는 생성하지 않는다. (미정) +- 커밋 메세지 첫 줄 컨벤션은 다음과 같다. + - [헤더] [SETB-{issue number}] 커밋 메세지 + - 헤더 종류는 다음과 같다. + - add: 기능 구현 + - fix: 코드/버그 수정 + - hofix: hotfix 브랜치에서 생성되는 모든 커밋 헤더 + - docs: 문서 작업 + - PR: PR 생성할 때 붙여주는 헤더 + ## Todo ### general -- new From 4f66e39f20878cc488b180d892df330068e8e5c1 Mon Sep 17 00:00:00 2001 From: minsoo kim Date: Fri, 29 Oct 2021 00:37:40 +0900 Subject: [PATCH 2/5] [docs] [SETB-40] add branch convention --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index fda41cb..594c78b 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,11 @@ - docs: 문서 작업 - PR: PR 생성할 때 붙여주는 헤더 +### Branch Convention + +- 브랜치 네이밍 컨벤션 + - SETB-{issue number}/{branch name}-{work feature} + ## Todo ### general -- new From 78913d358fd186e45e54f128fc5ed3e112484152 Mon Sep 17 00:00:00 2001 From: minsoo kim Date: Fri, 29 Oct 2021 00:45:13 +0900 Subject: [PATCH 3/5] =?UTF-8?q?yml=20file=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/testCI.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testCI.yml b/.github/workflows/testCI.yml index bc00e46..aac7b18 100644 --- a/.github/workflows/testCI.yml +++ b/.github/workflows/testCI.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + - branch jobs: test: @@ -25,7 +26,7 @@ jobs: # 테스트 후 Result를 보기위해 Publish Unit Test Results step 추가 - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v1 - if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 + if: ${{ always() }} # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정 with: files: out/test-results/**/*.xml @@ -37,4 +38,4 @@ jobs: fields: repo,message,commit,author,action,eventName,ref,workflow,job,took env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required - if: always() # Pick up events even if the job fails or is canceled. \ No newline at end of file + if: always() # Pick up events even if the job fails or is canceled. From f21ad30c67bf8c5e5bc195d5a710a996b81a8823 Mon Sep 17 00:00:00 2001 From: minsoo kim Date: Fri, 29 Oct 2021 00:48:28 +0900 Subject: [PATCH 4/5] =?UTF-8?q?yml=20file=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/testCI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testCI.yml b/.github/workflows/testCI.yml index aac7b18..4e1f3c8 100644 --- a/.github/workflows/testCI.yml +++ b/.github/workflows/testCI.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - master - - branch + - develop jobs: test: From 47bd5c476e14768f7e6a029215e38e217beae2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=88=98?= <57122180+minsoo-web@users.noreply.github.com> Date: Fri, 29 Oct 2021 00:58:21 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[hotfix]=20[SETB-41]=20999=20+=202=20=3D=3D?= =?UTF-8?q?=3D=202=20=EB=9D=BC=EA=B3=A0=20=EC=83=9D=EA=B0=81=ED=95=9C=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/testPackage/TestFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testPackage/TestFile.java b/test/testPackage/TestFile.java index 55e17ce..49d845e 100644 --- a/test/testPackage/TestFile.java +++ b/test/testPackage/TestFile.java @@ -1,7 +1,7 @@ package testPackage; public class TestFile { - private static int num = 999; + private static int num = 0; public static int getNum() { return num;