From 92890b21348032ab6107df047ac7b5d497aaf666 Mon Sep 17 00:00:00 2001 From: Young-do Cho Date: Fri, 23 Aug 2024 23:02:53 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20main=20=EB=B8=8C=EB=9E=9C=EC=B9=98=20?= =?UTF-8?q?=EB=A8=B8=EC=A7=80=ED=95=A0=EB=95=8C=20=EC=9E=90=EB=8F=99=20tag?= =?UTF-8?q?ging=20(#51)=20#minor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pc 온보딩 문구 임의로 변경 * main 브랜치에 머지되면 자동 tag 생성되도록 * 직접 태그 선택해서 배포할 수도 있도록 변경 --- .github/workflows/bump-up.yml | 39 +++++++++++++++++++++++++++++++ .github/workflows/release.yml | 6 +++++ src/renderer/pages/onboarding.tsx | 4 ++-- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/bump-up.yml diff --git a/.github/workflows/bump-up.yml b/.github/workflows/bump-up.yml new file mode 100644 index 0000000..0cb32df --- /dev/null +++ b/.github/workflows/bump-up.yml @@ -0,0 +1,39 @@ +name: Bump version +on: + push: + branches: + - main + +jobs: + update-version: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Determine version type + id: get_version_type + run: | + last_commit_message=$(git log -1 --pretty=%B) + echo "Last commit message: $last_commit_message" + + if [[ "$last_commit_message" == *"#major"* ]]; then + echo "version_type=major" >> $GITHUB_ENV + elif [[ "$last_commit_message" == *"#minor"* ]]; then + echo "version_type=minor" >> $GITHUB_ENV + else + echo "No specific version bump keyword found. Defaulting to patch." + echo "version_type=patch" >> $GITHUB_ENV + fi + + - name: Bump version + run: | + git config --local user.name "github-actions[bot]" + git config --local user.email "github-actions[bot]@users.noreply.github.com" + npm version ${{ env.version_type }} + + - name: Push changes + uses: ad-m/github-push-action@master + with: + tags: true + branch: ${{ github.ref }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8f4dae..b8501ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,12 @@ on: push: tags: - 'v*' + workflow_dispatch: + inputs: + tag: + description: 'Tag to trigger on' + required: true + type: string jobs: publish_on_linux: diff --git a/src/renderer/pages/onboarding.tsx b/src/renderer/pages/onboarding.tsx index f308754..20de48e 100644 --- a/src/renderer/pages/onboarding.tsx +++ b/src/renderer/pages/onboarding.tsx @@ -26,8 +26,8 @@ const contents = [ imageSrc: onboardingImage1, }, { - title: '다른 앱을 실행하면 방해 알림을 보내요', - description: '뽀모도로를 실행한 후, 다른 앱을 사용하면\n설정한 주기로 방해 알림을 보내드려요.', + title: '집중, 휴식시간이 끝나면 알림을 보내요', + description: '뽀모도로를 실행한 후, 목표 시간이 지나면\n시간이 끝났다는 알림을 보내드려요.', imageSrc: onboardingImage2, }, {