Skip to content

Commit

Permalink
release(17.3.0): release 17.3.0 (#1779)
Browse files Browse the repository at this point in the history
  • Loading branch information
cipchk committed Mar 13, 2024
1 parent a330936 commit 64c70b9
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 13 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
run: ./scripts/ci/build-artifacts.sh
env:
ACCESS_TOKEN: ${{ secrets.CI_TOKEN }}
MESSAGE: ${{ github.event.pull_request.title || github.event.head_commit.message }}
- name: Build site
run: yarn run site:build
- name: 'Deploy Site'
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# [17.3.0](https://github.com/ng-alain/delon/compare/17.2.0...17.3.0) (2024-03-13)


### Bug Fixes

* **abc:reuse-tab:** fix can't cache when component is not used ([#1769](https://github.com/ng-alain/delon/issues/1769)) ([4cb939b](https://github.com/ng-alain/delon/commit/4cb939b390967262584f1ca50623f764fe98fa7f))
* **abc:st:** fix sorting trigger misalignment in mulit-column ([#1767](https://github.com/ng-alain/delon/issues/1767)) ([4e9aab8](https://github.com/ng-alain/delon/commit/4e9aab89105df1f01061c51acfc921e06270c772))
* update theme/package.json to depend on @delon/abc and @delon/form ([#1766](https://github.com/ng-alain/delon/issues/1766)) ([b7ea5ac](https://github.com/ng-alain/delon/commit/b7ea5ac9d08d97bec9609f6a4572213ba79116a8))

### Features

* **auth:** ignore all local resource ([#1775](https://github.com/ng-alain/delon/issues/1775)) ([cd8641e](https://github.com/ng-alain/delon/commit/cd8641e5902e1eedd78053591e84320426502be9))

### Breaking Changes

* **abc:cell** widget `data` type changed to `CellTextResult` ([#1771](https://github.com/ng-alain/delon/issues/1771)) ([920b5ab](https://github.com/ng-alain/delon/commit/920b5abc240761a2248feaa45d8f2fd046177f19))



# [17.2.0](https://github.com/ng-alain/delon/compare/17.1.0...17.2.0) (2024-02-02)


Expand Down
17 changes: 17 additions & 0 deletions docs/changelog.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,23 @@ NG-ALAIN strictly follows [Semantic Versioning 2.0.0](http://semver.org/lang/zh-

---

# [17.3.0](https://github.com/ng-alain/delon/compare/17.2.0...17.3.0) (2024-03-13)

### Bug Fixes

* **abc:reuse-tab:** fix can't cache when component is not used ([#1769](https://github.com/ng-alain/delon/issues/1769)) ([4cb939b](https://github.com/ng-alain/delon/commit/4cb939b390967262584f1ca50623f764fe98fa7f))
* **abc:st:** fix sorting trigger misalignment in mulit-column ([#1767](https://github.com/ng-alain/delon/issues/1767)) ([4e9aab8](https://github.com/ng-alain/delon/commit/4e9aab89105df1f01061c51acfc921e06270c772))
* update theme/package.json to depend on @delon/abc and @delon/form ([#1766](https://github.com/ng-alain/delon/issues/1766)) ([b7ea5ac](https://github.com/ng-alain/delon/commit/b7ea5ac9d08d97bec9609f6a4572213ba79116a8))

### Features

* **auth:** ignore all local resource ([#1775](https://github.com/ng-alain/delon/issues/1775)) ([cd8641e](https://github.com/ng-alain/delon/commit/cd8641e5902e1eedd78053591e84320426502be9))

### Breaking Changes

* **abc:cell** widget `data` type changed to `CellTextResult` ([#1771](https://github.com/ng-alain/delon/issues/1771)) ([920b5ab](https://github.com/ng-alain/delon/commit/920b5abc240761a2248feaa45d8f2fd046177f19))


# [17.2.0](https://github.com/ng-alain/delon/compare/17.1.0...17.2.0) (2024-02-02)

### Bug Fixes
Expand Down
17 changes: 17 additions & 0 deletions docs/changelog.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,23 @@ NG-ALAIN 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/)

---

# [17.3.0](https://github.com/ng-alain/delon/compare/17.2.0...17.3.0) (2024-03-13)

### Bug Fixes

* **abc:reuse-tab:** 修复未使用组件时无法触发路由复用 ([#1769](https://github.com/ng-alain/delon/issues/1769)) ([4cb939b](https://github.com/ng-alain/delon/commit/4cb939b390967262584f1ca50623f764fe98fa7f))
* **abc:st:** 修复多表头下触发排序错位 ([#1767](https://github.com/ng-alain/delon/issues/1767)) ([4e9aab8](https://github.com/ng-alain/delon/commit/4e9aab89105df1f01061c51acfc921e06270c772))
* `@delon/theme` 依赖安装 `@delon/abc``@delon/form` ([#1766](https://github.com/ng-alain/delon/issues/1766)) ([b7ea5ac](https://github.com/ng-alain/delon/commit/b7ea5ac9d08d97bec9609f6a4572213ba79116a8))

### Features

* **auth:** 忽略所有本地路径,指的是 `assets/` 路径 ([#1775](https://github.com/ng-alain/delon/issues/1775)) ([cd8641e](https://github.com/ng-alain/delon/commit/cd8641e5902e1eedd78053591e84320426502be9))

### Breaking Changes

* **abc:cell** 自定义小部件 `data` 属性类型由变更为 `CellTextResult` ([#1771](https://github.com/ng-alain/delon/issues/1771)) ([920b5ab](https://github.com/ng-alain/delon/commit/920b5abc240761a2248feaa45d8f2fd046177f19))


# [17.2.0](https://github.com/ng-alain/delon/compare/17.1.0...17.2.0) (2024-02-02)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "delon",
"version": "17.2.0",
"version": "17.3.0",
"description": "Delon is a set of essential modules for NG-ALAIN.",
"keywords": [
"delon",
Expand Down
23 changes: 11 additions & 12 deletions scripts/ci/build-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@ set -e

readonly thisDir=$(cd $(dirname $0); pwd)

${thisDir}/build.sh

cd $(dirname $0)/../..

DIST="$(pwd)/dist"

commitSha=$(git rev-parse --short HEAD)
commitAuthorName=$(git --no-pager show -s --format='%an' HEAD)
commitAuthorEmail=$(git --no-pager show -s --format='%ae' HEAD)
commitMessage=$(git log --oneline -n 1)
commitMessageCheck=$(git log --oneline -n 2)

echo "Current commit author name: ${commitAuthorName}"
echo "Current commit message: ${MESSAGE}"

${thisDir}/build.sh

cd $(dirname $0)/../..

DIST="$(pwd)/dist"

# if [[ ${commitAuthorName} != '卡色' && ${commitAuthorName} != 'cipchk' ]]; then
# echo "Warning: Just only 卡色 or cipchk user"
Expand All @@ -43,7 +42,7 @@ branchName=${TRAVIS_BRANCH:-'master'}

buildVersionName="${buildVersion}-${commitSha}"
buildTagName="${branchName}-${commitSha}"
buildCommitMessage="${branchName} - ${commitMessage}"
buildCommitMessage="${branchName} - ${MESSAGE}"

repoUrl="https://github.com/ng-alain/${packageRepo}.git"
repoDir="${DIST}/${packageRepo}"
Expand Down Expand Up @@ -79,7 +78,7 @@ cp -r ${buildDir}/* ./
echo "Removed everything from ${packageRepo}#${branchName} and added the new build output."

# 替换版本号
if [[ $commitMessageCheck =~ "release(" ]]; then
if [[ $MESSAGE =~ "release(" ]]; then
echo "===== Release version does not need to change version ====="
else
echo "Replace build version..."
Expand Down Expand Up @@ -109,9 +108,9 @@ git push origin ${branchName} --tags

echo "Published package artifacts for ${packageName}#${buildVersionName} into ${branchName}"

if [[ $commitMessageCheck =~ "release(" ]]; then
if [[ $MESSAGE =~ "release(" ]]; then
echo "Release version does not need to change version ====="
echo "COMMIT SOURCE: ${commitMessageCheck}"
echo "COMMIT SOURCE: ${MESSAGE}"
fi

echo "Download link:"
Expand Down
5 changes: 5 additions & 0 deletions scripts/publish/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ clone() {
cd ${DIST}
echo ">>> Clone delon & cli dist..."
git clone --depth 1 https://github.com/ng-alain/delon-builds.git
BUILD_VERSION=$(node -p "require('${ROOT}/ng-alain/package.json').version")
if [[ $VERSION != $BUILD_VERSION ]]; then
echo "待发布版本[${VERSION}]与远程版本[${BUILD_VERSION}]不一致"
exit 1
fi
}

publishToMaster() {
Expand Down

0 comments on commit 64c70b9

Please sign in to comment.