From 9ba5ae62da0727862619d111ac307fb27975ea67 Mon Sep 17 00:00:00 2001 From: bluetree7878 Date: Fri, 13 Sep 2024 23:48:45 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=93=83=20Docs(#6):=20=EB=A6=AC?= =?UTF-8?q?=EB=93=9C=EB=AF=B8=20=EB=B8=8C=EB=9E=9C=EC=B9=98=20=EC=A0=84?= =?UTF-8?q?=EB=9E=B5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9707653e..898b0101 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ 8기 메인 프로젝트 프론트엔드 레포지토리입니다. ## 기술 스택 +

Language & Tools:

@@ -12,7 +13,6 @@ ![TypeScript](https://img.shields.io/badge/typescript-%23007ACC.svg?style=for-the-badge&logo=typescript&logoColor=white)   ![NodeJS](https://img.shields.io/badge/node.js-6DA55F?style=for-the-badge&logo=node.js&logoColor=white) -

Framework & Library:

![React](https://img.shields.io/badge/react-%2320232a.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB)   @@ -22,12 +22,10 @@ ![SweetAlert2](https://img.shields.io/badge/SweetAlert2-5A67D8?style=for-the-badge&logo=SweetAlert2&logoColor=white)   ![React-Icons](https://img.shields.io/badge/React--Icons-61DBFB?style=for-the-badge&logo=react&logoColor=white) -

Global-State:

![Zustand](https://img.shields.io/badge/zustand-8B4513.svg?style=for-the-badge&logo=zustand&logoColor=white) -

Module Bundler:

![Vite](https://img.shields.io/badge/vite-%23646CFF.svg?style=for-the-badge&logo=vite&logoColor=white) @@ -38,19 +36,20 @@ ![Prettier](https://img.shields.io/badge/prettier-%23F7B93E.svg?style=for-the-badge&logo=prettier&logoColor=white)   ![ENV](https://img.shields.io/badge/.env-%23000000.svg?style=for-the-badge&logo=dotenv&logoColor=%23FFDD00) -

Communication:

![Git](https://img.shields.io/badge/git-%23F05033.svg?style=for-the-badge&logo=git&logoColor=white)   ![GitHub](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white)   - ![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)   + ![GitHub Actions](https://img.shields.io/badge/github%20actions-%232671E5.svg?style=for-the-badge&logo=githubactions&logoColor=white)   ![Notion](https://img.shields.io/badge/notion-%23FFFFFF.svg?style=for-the-badge&logo=notion&logoColor=black)   + ![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)   ![Figma](https://img.shields.io/badge/figma-%23F24E1E.svg?style=for-the-badge&logo=figma&logoColor=white)
-*** +--- ## 커밋 메시지 컨벤션 + git commit -m "✨ Feature(#123): 커밋 내용" | Type | Description | @@ -65,3 +64,49 @@ | 📝 Modify | 기능, 코드 수정 | | 🔨 Refactor | 코드 리팩토링 | | 🎨 Publish | 마크업 & 스타일링 | + +## 브랜치 전략 + +- `feature/#이슈 번호/이슈 제목` +- 이슈 생성 시 자동 브랜치 생성 + +```yml +#issue-branch.yml +branchName: '#${issue.number}/${issue.title}' +gitSafeReplacementChar: '_' +autoCloseIssue: true +commentMessage: 'Branch ${branchName} created for issue: ${issue.title}' + +branches: + - label: 🌏 Deploy + prefix: deploy/ + - label: ⚙ Setting + prefix: setting/ + + ... + + - label: '*' + prefix: issue/ + +copyIssueLabelsToPR: true +copyIssueAssigneeToPR: true +copyIssueProjectsToPR: true + +# workflow/create_branch_for_issue.yml +on: + issues: + types: [assigned] + issue_comment: + types: [created] + pull_request: + types: [closed] + +jobs: + create_issue_branch_job: + runs-on: ubuntu-latest + steps: + - name: Create Issue Branch + uses: robvanderleek/create-issue-branch@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +``` From a04e822830602f4eeb7502953218526f64cd80d9 Mon Sep 17 00:00:00 2001 From: bluetree7878 Date: Sat, 14 Sep 2024 00:27:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=83=20Docs(#6):=20PR=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=8B=9C=EC=97=90=EB=8F=84=20=EC=95=A1=EC=85=98=20?= =?UTF-8?q?=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/create-issue-branch.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-issue-branch.yml b/.github/workflows/create-issue-branch.yml index 86cb3392..5537a922 100644 --- a/.github/workflows/create-issue-branch.yml +++ b/.github/workflows/create-issue-branch.yml @@ -4,7 +4,7 @@ on: issue_comment: types: [created] pull_request: - types: [closed] + types: [opened, closed] jobs: create_issue_branch_job: diff --git a/README.md b/README.md index 898b0101..b9f79b10 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ on: issue_comment: types: [created] pull_request: - types: [closed] + types: [opened, closed] jobs: create_issue_branch_job: From e3aa7d3fbcae2131c2431c081a7fdc4ea2adf6d2 Mon Sep 17 00:00:00 2001 From: bluetree7878 Date: Tue, 17 Sep 2024 18:04:26 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=83=20Docs(#6):=20Issue=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20PR=20=EB=B3=B5=EC=82=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/issue-branch.yml | 8 ++-- .github/workflows/create-issue-branch.yml | 2 +- README.md | 46 ----------------------- 3 files changed, 5 insertions(+), 51 deletions(-) diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml index 6b17a563..6f41dcd2 100644 --- a/.github/issue-branch.yml +++ b/.github/issue-branch.yml @@ -3,6 +3,10 @@ gitSafeReplacementChar: '_' autoCloseIssue: true commentMessage: 'Branch ${branchName} created for issue: ${issue.title}' +copyIssueLabelsToPR: true +copyIssueAssigneeToPR: true +copyIssueProjectsToPR: true + branches: - label: 🌏 Deploy prefix: deploy/ @@ -26,7 +30,3 @@ branches: prefix: publish/ - label: '*' prefix: issue/ - -copyIssueLabelsToPR: true -copyIssueAssigneeToPR: true -copyIssueProjectsToPR: true diff --git a/.github/workflows/create-issue-branch.yml b/.github/workflows/create-issue-branch.yml index 5537a922..86cb3392 100644 --- a/.github/workflows/create-issue-branch.yml +++ b/.github/workflows/create-issue-branch.yml @@ -4,7 +4,7 @@ on: issue_comment: types: [created] pull_request: - types: [opened, closed] + types: [closed] jobs: create_issue_branch_job: diff --git a/README.md b/README.md index b9f79b10..e2964a78 100644 --- a/README.md +++ b/README.md @@ -64,49 +64,3 @@ | 📝 Modify | 기능, 코드 수정 | | 🔨 Refactor | 코드 리팩토링 | | 🎨 Publish | 마크업 & 스타일링 | - -## 브랜치 전략 - -- `feature/#이슈 번호/이슈 제목` -- 이슈 생성 시 자동 브랜치 생성 - -```yml -#issue-branch.yml -branchName: '#${issue.number}/${issue.title}' -gitSafeReplacementChar: '_' -autoCloseIssue: true -commentMessage: 'Branch ${branchName} created for issue: ${issue.title}' - -branches: - - label: 🌏 Deploy - prefix: deploy/ - - label: ⚙ Setting - prefix: setting/ - - ... - - - label: '*' - prefix: issue/ - -copyIssueLabelsToPR: true -copyIssueAssigneeToPR: true -copyIssueProjectsToPR: true - -# workflow/create_branch_for_issue.yml -on: - issues: - types: [assigned] - issue_comment: - types: [created] - pull_request: - types: [opened, closed] - -jobs: - create_issue_branch_job: - runs-on: ubuntu-latest - steps: - - name: Create Issue Branch - uses: robvanderleek/create-issue-branch@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -```