From 0014eac997e7d63d33ebbe1262d220bce4a08722 Mon Sep 17 00:00:00 2001 From: msojocs Date: Mon, 25 Apr 2022 19:09:41 +0800 Subject: [PATCH] update: check version of snap --- .husky/pre-commit | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 2ab12eb..1fd22d6 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -11,11 +11,13 @@ VERSION_DATA=(${VERSION_DATA//,/ }) TARGET_VERSION=${VERSION_DATA[0]} TARGET_VERSION_MD5=${VERSION_DATA[1]} +LATEST_TAG=$(git describe --abbrev=0) + # 检查snapcraft主版本号是否正确 -SNAP_VERSION=$(find $root_dir/snap -name "snapcraft.yaml" | xargs grep -P "'\d+\.\d+\.\d{5,}" -o) -if [ "${SNAP_VERSION//\'/}" != "$TARGET_VERSION" ];then - echo "SNAP版本不匹配!!!" - echo "SNAP版本: $SNAP_VERSION != 目标版本: $TARGET_VERSION" +SNAP_VERSION=$(find $root_dir/snap -name "snapcraft.yaml" | xargs grep -P "'\d+\.\d+\.\d+-\d+" -o) +if [ "v${SNAP_VERSION//\'/}" != "$LATEST_TAG" ];then + echo "SNAP版本不正确!!!" + echo "SNAP版本: v${SNAP_VERSION//\'/} != 最新TAG: $LATEST_TAG" exit 1 fi