Merge branch 'main' into next

CHANGELOG.md

@@ -5,20 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v1.4.0-alpha.17](https://github.com/nocobase/nocobase/compare/v1.4.0-alpha.16...v1.4.0-alpha.17) - 2024-11-19
-
-### 🚀 Improvements
-
-- **[Workflow]** support to register system variables in client ([#5676](https://github.com/nocobase/nocobase/pull/5676)) by @mytharcher
-
-### 🐛 Bug Fixes
-
-- **[client]** Fix  field permission check not affected by association field context ([#5672](https://github.com/nocobase/nocobase/pull/5672)) by @katherinehhh
-
-- **[Block: Gantt]** Fix gantt block template incorrectly calls the calendar block when adding ([#5673](https://github.com/nocobase/nocobase/pull/5673)) by @katherinehhh
-
-- **[Calendar]** Fix missing date field options with and without timezone in calendar block ([#5674](https://github.com/nocobase/nocobase/pull/5674)) by @katherinehhh
-
 ## [v1.3.50-beta](https://github.com/nocobase/nocobase/compare/v1.3.49-beta...v1.3.50-beta) - 2024-11-14
 
 ### 🐛 Bug Fixes

CHANGELOG.zh-CN.md

@@ -5,20 +5,6 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。
 
-## [v1.4.0-alpha.17](https://github.com/nocobase/nocobase/compare/v1.4.0-alpha.16...v1.4.0-alpha.17) - 2024-11-19
-
-### 🚀 优化
-
-- **[工作流]** 支持在前端扩展工作流的系统变量 ([#5676](https://github.com/nocobase/nocobase/pull/5676)) by @mytharcher
-
-### 🐛 修复
-
-- **[client]** 修复 字段权限判断被关系字段上下文影响 ([#5672](https://github.com/nocobase/nocobase/pull/5672)) by @katherinehhh
-
-- **[区块：甘特图]** 修复甘特图添加区块时模板列表为日历区块的模板 ([#5673](https://github.com/nocobase/nocobase/pull/5673)) by @katherinehhh
-
-- **[日历]** 修复日历区块中日期字段选项缺失无时区和含时区字段 ([#5674](https://github.com/nocobase/nocobase/pull/5674)) by @katherinehhh
-
 ## [v1.3.50-beta](https://github.com/nocobase/nocobase/compare/v1.3.49-beta...v1.3.50-beta) - 2024-11-14
 
 ### 🐛 修复
@@ -519,4 +505,3 @@ Reference: [开发指南](https://docs-cn.nocobase.com/handbook/acl#%E5%BC%80%E5
 ### 🐛 修复
 
 - **[操作：导出记录]** 修复导出关系数据不正确的问题 ([#5170](https://github.com/nocobase/nocobase/pull/5170)) by @chareice
-

Dockerfile

@@ -15,10 +15,16 @@ WORKDIR /tmp
 COPY . /tmp
 RUN  yarn install && yarn build --no-dts
 
-RUN cd /tmp && \
-    NEWVERSION="$(cat lerna.json | jq '.version' | tr -d '"').$(date +'%Y%m%d%H%M%S')" \
-        &&  git checkout -b release-$(date +'%Y%m%d%H%M%S') \
-        && yarn lerna version ${NEWVERSION} -y --no-git-tag-version
+SHELL ["/bin/bash", "-c"]
+
+RUN CURRENTVERSION="$(jq -r '.version' lerna.json)" && \
+  IFS='.-' read -r major minor patch label <<< "$CURRENTVERSION" && \
+  if [ -z "$label" ]; then CURRENTVERSION="$CURRENTVERSION-rc"; fi && \
+  cd /tmp && \
+  NEWVERSION="$(echo $CURRENTVERSION).$(date +'%Y%m%d%H%M%S')" \
+  &&  git checkout -b release-$(date +'%Y%m%d%H%M%S') \
+  && yarn lerna version ${NEWVERSION} -y --no-git-tag-version
+
 RUN git config user.email "test@mail.com"  \
     && git config user.name "test" && git add .  \
     && git commit -m "chore(versions): test publish packages"

scripts/release/changelogAndRelease.js

@@ -378,10 +378,13 @@ async function getVersion() {
     switch (ver) {
       case 'rc':
         tagPattern = '^v[1-9]+.[0-9]+.[0-9]+$';
+        break;
       case 'beta':
         tagPattern = '^v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+$';
+        break;
       case 'alpha':
         tagPattern = '^v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+$';
+        break;
     }
     const { stdout: tags } = await execa(`git tag -l --sort=creatordate | grep -E "${tagPattern}" | tail -2`, {
       shell: true,