workflow: update git hook

ArkMowers · Jan 27, 2022 · ea70f51 · ea70f51
1 parent 0bce24c
commit ea70f51
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 58 deletions.
diff --git a/.github/git-hooks/commit-msg b/.github/git-hooks/commit-msg
@@ -4,7 +4,7 @@
 
 COMMIT_MESSAGE=`cat $1`
 COMMIT_RE="^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|release|hotfix|workflow|update)(\(.+\))?: .{1,100}"
-MERGE_RE="^Merge branch"
+MERGE_RE="^Merge "
 
 if [[ ! $COMMIT_MESSAGE =~ $COMMIT_RE ]] && [[ ! $COMMIT_MESSAGE =~ $MERGE_RE ]]
 then

diff --git a/.github/gitflow-hooks/filter-flow-hotfix-start-version b/.github/gitflow-hooks/filter-flow-hotfix-start-version
@@ -16,7 +16,7 @@
 # VERSION=$1
 
 VERSION=$1
-VERSION_RE="^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$"
+VERSION_RE="^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(a[1-9][0-9]*)?$"
 if [[ ! $VERSION =~ $VERSION_RE ]]
 then
     # echo "Illegal version format: $VERSION"

diff --git a/.github/gitflow-hooks/filter-flow-release-start-version b/.github/gitflow-hooks/filter-flow-release-start-version
@@ -16,7 +16,7 @@
 # VERSION=$1
 
 VERSION=$1
-VERSION_RE="^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$"
+VERSION_RE="^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(a[1-9][0-9]*)?$"
 if [[ ! $VERSION =~ $VERSION_RE ]]
 then
     # echo "Illegal version format: $VERSION"

diff --git a/.github/gitflow-hooks/post-flow-release-start b/.github/gitflow-hooks/post-flow-release-start
diff --git a/.github/gitflow-hooks/pre-flow-hotfix-finish b/.github/gitflow-hooks/pre-flow-hotfix-finish
@@ -5,8 +5,8 @@
 # Positional arguments:
 # $1    The version (including the version prefix)
 # $2    The origin remote
-# $3    The full branch name (including the feature prefix)
-# $4    The base from which this feature is started
+# $3    The full branch name (including the hotfix prefix)
+# $4    The base from which this hotfix is started
 #
 # The following variables are available as they are exported by git-flow:
 #
@@ -22,8 +22,5 @@ ROOT=`git rev-parse --show-toplevel`
 VERSION=${1:1}
 
 sed -i "s/__version__ = '[0-9\.a]\+'/__version__ = '$VERSION'/g" "$ROOT/arknights_mower/__init__.py"
-cp "$ROOT/doc/CHANGELOG/hotfix.md" "$ROOT/doc/CHANGELOG/$VERSION.md"
-node "$ROOT/doc/CHANGELOG/$VERSION.md"
 git add "$ROOT/arknights_mower/__init__.py"
-git add "$ROOT/doc/CHANGELOG/$VERSION.md"
 git commit -m "hotfix: v$VERSION"
diff --git a/.github/gitflow-hooks/pre-flow-release-delete b/.github/gitflow-hooks/pre-flow-release-delete
diff --git a/.github/gitflow-hooks/pre-flow-release-finish b/.github/gitflow-hooks/pre-flow-release-finish
@@ -21,6 +21,6 @@
 ROOT=`git rev-parse --show-toplevel`
 VERSION=${1:1}
 
+sed -i "s/__version__ = '[0-9\.a]\+'/__version__ = '$VERSION'/g" "$ROOT/arknights_mower/__init__.py"
 git add "$ROOT/arknights_mower/__init__.py"
-git add "$ROOT/doc/CHANGELOG/$VERSION.md"
 git commit -m "release: v$VERSION"