From d9d4e691b0630038e0e7388bae08c6ca25a2405c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=96=B8=EB=8D=95?= <110515401+leeunduck@users.noreply.github.com> Date: Tue, 23 Sep 2025 02:45:12 +0900 Subject: [PATCH 1/2] Fix/ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CDP-27 choreโš™๏ธ: GitHub Actions (CI) ์„ธํŒ… * CDP-24 fix๐Ÿ›: add pnpm packageManager * CDP-24 fix๐Ÿ›: fix pnpm run syntax in frontend-ci workflow --- .github/workflows/frontend-ci.yml | 4 ++-- package.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frontend-ci.yml b/.github/workflows/frontend-ci.yml index 3795726..bef853a 100644 --- a/.github/workflows/frontend-ci.yml +++ b/.github/workflows/frontend-ci.yml @@ -39,7 +39,7 @@ jobs: key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }} restore-keys: ${{ runner.os }}-pnpm- - run: pnpm install --frozen-lockfile - - run: pnpm run lint --if-present + - run: pnpm run --if-present lint test: runs-on: ubuntu-latest @@ -61,7 +61,7 @@ jobs: key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }} restore-keys: ${{ runner.os }}-pnpm- - run: pnpm install --frozen-lockfile - - run: pnpm run test --if-present -- --ci + - run: pnpm run --if-present test -- --ci build: runs-on: ubuntu-latest diff --git a/package.json b/package.json index 4f473c5..46751ea 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "custom-daily-planner", "version": "0.1.0", "private": true, + "packageManager": "pnpm@10.16.1", "scripts": { "dev": "next dev", "build": "next build", From e01444e9cf79223dfac480e1f0dde2fa00dbdb85 Mon Sep 17 00:00:00 2001 From: HyunseokLEE Date: Tue, 23 Sep 2025 03:06:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?CDP-28=20chore=E2=9A=99=EF=B8=8F:=20PR=20?= =?UTF-8?q?=ED=94=84=EB=A6=AC=EB=B7=B0=20&=20=EB=A6=AC=EB=93=9C=EB=AF=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 9b1a9aa..5afa65c 100644 --- a/README.md +++ b/README.md @@ -92,15 +92,23 @@ develop์— ๋จธ์ง€๋œ ๊ธฐ๋Šฅ์ด ์ž˜ ์ž‘๋™ํ•˜๋Š”์ง€ ์ ๊ฒ€ํ•œ ์ดํ›„์— main ๋ธŒ - Github์—์„œ PR์„ ์ƒ์„ฑํ•˜๊ณ  ์•„๋ž˜ ํ…œํ”Œ๋ฆฟ์„ ์ฑ„์›Œ์ฃผ์„ธ์š”. - ```markdown - ## Feature Description +```markdown +## ๐Ÿ” ๋ณ€๊ฒฝ ์‚ฌํ•ญ - - ๊ธฐ๋Šฅ ์„ค๋ช… + - ## To Reviewers +--- - - ๋ฆฌ๋ทฐ/์ ๊ฒ€ ์‹œ ์œ ์˜ํ•  ์  - ``` +## ๐Ÿ“ธ ์Šคํฌ๋ฆฐ์ƒท + + + +--- + +## ๐Ÿšง ๊ด€๋ จ ์ด์Šˆ + + +``` 3. **Squash Merge** @@ -113,15 +121,19 @@ develop์— ๋จธ์ง€๋œ ๊ธฐ๋Šฅ์ด ์ž˜ ์ž‘๋™ํ•˜๋Š”์ง€ ์ ๊ฒ€ํ•œ ์ดํ›„์— main ๋ธŒ - ๋ฌธ์ œ๊ฐ€ ์—†๋‹ค๋ฉด `main` ๋ธŒ๋žœ์น˜๋กœ ๋จธ์ง€ํ•˜์—ฌ ๋ฐฐํฌํ•ฉ๋‹ˆ๋‹ค. - ์ด๋•Œ PR์„ ์ƒ์„ฑํ•˜๊ณ  ์•„๋ž˜ ํ…œํ”Œ๋ฆฟ์„ ์ฑ„์›Œ์ฃผ์„ธ์š”. - ```markdown - ## Deploy Checklist +```markdown +## ๐Ÿ› ๏ธ ์ตœ์ข… ๋ฐฐํฌ ์ ๊ฒ€ ๋ฆฌ์ŠคํŠธ + +- [ ] ์ฃผ์š” ๊ธฐ๋Šฅ ๋™์ž‘ ํ™•์ธ +- [ ] ๋นŒ๋“œ/๋ฐฐํฌ ํ™˜๊ฒฝ ์ ๊ฒ€ +- [ ] ๋ฌธ์„œ/์„ค์ • ๊ฒ€ํ†  - - ์ ๊ฒ€ํ•ด์•ผ ํ•  ๊ธฐ๋Šฅ ๋ชฉ๋ก +--- - ## Result +## โœ… ์ตœ์ข… ๋ฐฐํฌ ์ ๊ฒ€ ๊ฒฐ๊ณผ - - ์ ๊ฒ€ ๊ฒฐ๊ณผ ๋ฐ ํŠน์ด์‚ฌํ•ญ - ``` + +``` 5. **๋ฐฐํฌ ํ›„ ๋กœ์ปฌ ์ตœ์‹ ํ™” & ๋ธŒ๋žœ์น˜ ์ •๋ฆฌ**