From 22874c14d6be2bccdd93cdbdc56e155860dad560 Mon Sep 17 00:00:00 2001 From: teawon Date: Sun, 9 Mar 2025 18:08:07 +0900 Subject: [PATCH 1/2] chore: test --- .github/workflows/release.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21277b5..1355859 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,13 +4,17 @@ on: push: branches: - develop + pull_request: + types: [closed] + branches: + - develop # 동일한 워크플로우가 동시에 실행되는 것을 방지 concurrency: ${{ github.workflow }}-${{ github.ref }} jobs: - release: - name: Release + create-release-pr: + if: github.event_name == 'push' || github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - name: Checkout @@ -18,6 +22,13 @@ jobs: with: base: main head: develop + branch: release + title: "🚀 Release: Merge develop to main" + body: | + ## 변경사항 + ${{ github.event_name == 'pull_request' && github.event.pull_request.body || 'Direct push to develop' }} + commit-message: "chore: merge develop to main" + delete-branch: true - name: Setup Node.js uses: actions/setup-node@v3 From 562bac02b113b8e39dee4594494a9bef91515e9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 9 Mar 2025 09:08:39 +0000 Subject: [PATCH 2/2] chore: version packages --- .changeset/ripe-states-like.md | 5 ----- .changeset/thin-frogs-listen.md | 5 ----- .github/workflows/release.yml | 35 ++++++++------------------------- CHANGELOG.md | 7 +++++++ package.json | 2 +- 5 files changed, 16 insertions(+), 38 deletions(-) delete mode 100644 .changeset/ripe-states-like.md delete mode 100644 .changeset/thin-frogs-listen.md diff --git a/.changeset/ripe-states-like.md b/.changeset/ripe-states-like.md deleted file mode 100644 index ed66d18..0000000 --- a/.changeset/ripe-states-like.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"commitcrawler": patch ---- - -다중 탭 정보 읽기 데이터 불일치 문제 수정 diff --git a/.changeset/thin-frogs-listen.md b/.changeset/thin-frogs-listen.md deleted file mode 100644 index e214297..0000000 --- a/.changeset/thin-frogs-listen.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"commitcrawler": patch ---- - -changesets 기반의 버전관리 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1355859..e277edd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,6 @@ name: Release on: - push: - branches: - - develop pull_request: types: [closed] branches: @@ -14,11 +11,16 @@ concurrency: ${{ github.workflow }}-${{ github.ref }} jobs: create-release-pr: - if: github.event_name == 'push' || github.event.pull_request.merged == true + if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Create Release Pull Request + uses: peter-evans/create-pull-request@v5 with: base: main head: develop @@ -26,28 +28,7 @@ jobs: title: "🚀 Release: Merge develop to main" body: | ## 변경사항 - ${{ github.event_name == 'pull_request' && github.event.pull_request.body || 'Direct push to develop' }} + ${{ github.event.pull_request.title }} + ${{ github.event.pull_request.body }} commit-message: "chore: merge develop to main" delete-branch: true - - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - cache: "npm" - - - name: Install Dependencies - run: npm ci - - - name: Build - run: npm run build - - - name: Create Release Pull Request or Publish - id: changesets - uses: changesets/action@v1 - with: - publish: npm run release - title: "🚀 Version Packages" - commit: "chore: version packages" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index d4cda40..6f1b7ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # commitcrawler +## 1.0.3 + +### Patch Changes + +- 6e16f19: 다중 탭 정보 읽기 데이터 불일치 문제 수정 +- 3aac215: changesets 기반의 버전관리 + ## 1.0.2 ### Patch Changes diff --git a/package.json b/package.json index a2cdade..01fc025 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "commitcrawler", - "version": "1.0.2", + "version": "1.0.3", "description": "", "main": "commitInterceptor.js", "scripts": {