diff --git a/.husky/pre-commit b/.husky/pre-commit index db80f30..db2b70d 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -35,10 +35,13 @@ if [ "${SNAP_DEVTOOL_VERSION//=/}" != "${TARGET_VERSION//./}" ];then exit 1 fi -# LATEST_TAG=$(git describe --abbrev=0) -# SNAP_VERSION=$(grep -P "'\d+\.\d+\.\d+-\d+" -o $root_dir/snap/snapcraft.yaml) -# if [ "v${SNAP_VERSION//\'/}" != "$LATEST_TAG" ];then -# echo "SNAP版本与TAG不符!!!" -# echo "SNAP版本: v${SNAP_VERSION//\'/} != 最新TAG: $LATEST_TAG" -# exit 1 -# fi +# 有当前版本的TAG,检查snap版本是否符合要求 +LATEST_TAG=$(git describe --abbrev=0) +if [[ $LATEST_TAG == "v${TARGET_VERSION}"* ]];then + SNAP_VERSION=$(grep -P "'\d+\.\d+\.\d+-\d+" -o $root_dir/snap/snapcraft.yaml) + if [ "v${SNAP_VERSION//\'/}" != "$LATEST_TAG" ];then + echo "SNAP版本与TAG不符!!!" + echo "SNAP版本: v${SNAP_VERSION//\'/} != 最新TAG: $LATEST_TAG" + exit 1 + fi +fi diff --git a/changelog.md b/changelog.md index f049ca7..236ef79 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ -# 1.05.2204250-1 / 2022- +# 1.05.2204250-1 / 2022-04-26 - update: devtools 1.05.2204250 +- update: 跟进wcc编译器变更 # 1.05.2204180-2 / 2022-04-26 - feat: wcc,wcsc node模块懒加载template解析支持