From 30b00762f6da166c043587798b1552f27b4cc604 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Thu, 23 May 2024 19:08:50 +0900 Subject: [PATCH] fix: fix release workflow --- .github/workflows/release.yml | 12 +++++++----- .github/workflows/test.yml | 3 ++- Packages/src/.releaserc.json | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22d937b..023c5ce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,8 +5,8 @@ on: push: branches: - release - - release_preview - - release_v4 + - release-preview + - release-v4 tags-ignore: - "**" @@ -52,10 +52,12 @@ jobs: elif [ '${{ github.ref_name }}' = 'release' ]; then echo "merge_to=develop" | tee -a $GITHUB_OUTPUT echo "split_to=main" | tee -a $GITHUB_OUTPUT - elif [ '${{ github.ref_name }}' = 'release_preview' ]; then + elif [ '${{ github.ref_name }}' = 'release-preview' ]; then + echo "merge_to=develop-preview" | tee -a $GITHUB_OUTPUT echo "split_to=preview" | tee -a $GITHUB_OUTPUT - elif [ '${{ github.ref_name }}' = 'release_v4' ]; then - echo "split_to=v4" | tee -a $GITHUB_OUTPUT + elif [ '${{ github.ref_name }}' = 'release-4.x' ]; then + echo "merge_to=develop-4.x" | tee -a $GITHUB_OUTPUT + echo "split_to=4.x" | tee -a $GITHUB_OUTPUT fi merge-to: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e925ab8..534d201 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,8 @@ on: push: branches: - develop - - develop_v5 + - develop-preview + - develop-4.x tags: - "!*" paths-ignore: diff --git a/Packages/src/.releaserc.json b/Packages/src/.releaserc.json index 1a3d026..2d38f8e 100644 --- a/Packages/src/.releaserc.json +++ b/Packages/src/.releaserc.json @@ -1,9 +1,9 @@ { "branches": [ "release", - "release_v4", + "release-4.x", { - "name": "release_preview", + "name": "release-preview", "prerelease": true } ],