diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index f7e65abd04..7bc08f3d7e 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,4 +1,4 @@ -name: Auto merge main -> next +name: Auto merge concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.repository }} diff --git a/release.sh b/release.sh index 53c770cfba..9fd46e956b 100755 --- a/release.sh +++ b/release.sh @@ -15,7 +15,7 @@ if [ "$branch" == "main" ]; then elif [ "$branch" == "next" ]; then # beta if [ "$1" == '--is-feat' ]; then - new_version="$major.$minor.0-beta.0" + new_version="$major.$minor.0-beta.1" echo $new_version; else new_pre=$((pre + 1)) @@ -26,7 +26,7 @@ elif [ "$branch" == "develop" ]; then # alpha if [ "$1" == '--is-feat' ]; then new_minor=$((minor + 1)) - new_version="$major.$new_minor.0-alpha.0" + new_version="$major.$new_minor.0-alpha.1" echo $new_version; else new_pre=$((pre + 1)) diff --git a/scripts/release/changelogAndRelease.js b/scripts/release/changelogAndRelease.js index 1dc25705c5..bfe3f20c66 100644 --- a/scripts/release/changelogAndRelease.js +++ b/scripts/release/changelogAndRelease.js @@ -386,16 +386,18 @@ async function getVersion() { const { stdout: tags } = await execa(`git tag -l --sort=creatordate | grep -E "${tagPattern}" | tail -2`, { shell: true, }); + const tagsArr = tags.split('\n'); // 过渡处理 - if (tags.length === 1) { + if (tagsArr.length === 1) { if (ver === 'rc') { - tags.unshift('v1.3.50-beta'); + tagsArr.unshift('v1.3.50-beta'); } if (ver === 'beta') { - tags.unshift('v1.4.0-alpha.17'); + tagsArr.unshift('v1.4.0-alpha.17'); } } - [from, to] = tags.split('\n'); + from = tagsArr[0]; + to = tagsArr[1]; } console.log(`From: ${from}, To: ${to}`); return { from, to };