mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-05 05:29:26 +08:00
chore(ci): update (#5688)
* test: maunal-release * chore: update * test: manual-release-next * test: manual-release-develop * chore: update
This commit is contained in:
parent
c1f1407cb3
commit
7325ffe9b0
2
.github/workflows/auto-merge.yml
vendored
2
.github/workflows/auto-merge.yml
vendored
@ -1,4 +1,4 @@
|
||||
name: Auto merge main -> next
|
||||
name: Auto merge
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.repository }}
|
||||
|
@ -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))
|
||||
|
@ -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 };
|
||||
|
Loading…
x
Reference in New Issue
Block a user