fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2024-11-19 12:09:48 +00:00
commit 1279c3ddcf
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/auto-merge.yml vendored
View File

@ -1,4 +1,4 @@
name: Auto merge main -> next name: Auto merge
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.repository }} group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.repository }}

4
release.sh
View File

@ -15,7 +15,7 @@ if [ "$branch" == "main" ]; then
elif [ "$branch" == "next" ]; then elif [ "$branch" == "next" ]; then
# beta # beta
if [ "$1" == '--is-feat' ]; then if [ "$1" == '--is-feat' ]; then
new_version="$major.$minor.0-beta.0" new_version="$major.$minor.0-beta.1"
echo $new_version; echo $new_version;
else else
new_pre=$((pre + 1)) new_pre=$((pre + 1))
@ -26,7 +26,7 @@ elif [ "$branch" == "develop" ]; then
# alpha # alpha
if [ "$1" == '--is-feat' ]; then if [ "$1" == '--is-feat' ]; then
new_minor=$((minor + 1)) new_minor=$((minor + 1))
new_version="$major.$new_minor.0-alpha.0" new_version="$major.$new_minor.0-alpha.1"
echo $new_version; echo $new_version;
else else
new_pre=$((pre + 1)) new_pre=$((pre + 1))

10
scripts/release/changelogAndRelease.js
View File

@ -386,16 +386,18 @@ async function getVersion() {
const { stdout: tags } = await execa(`git tag -l --sort=creatordate | grep -E "${tagPattern}" | tail -2`, { const { stdout: tags } = await execa(`git tag -l --sort=creatordate | grep -E "${tagPattern}" | tail -2`, {
shell: true, shell: true,
}); });
const tagsArr = tags.split('\n');
// 过渡处理 // 过渡处理
if (tags.length === 1) { if (tagsArr.length === 1) {
if (ver === 'rc') { if (ver === 'rc') {
tags.unshift('v1.3.50-beta'); tagsArr.unshift('v1.3.50-beta');
} }
if (ver === '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}`); console.log(`From: ${from}, To: ${to}`);
return { from, to }; return { from, to };