From 29e82c2a7e04ceee4fc504df79cdf737f33c7a35 Mon Sep 17 00:00:00 2001 From: Saejin Mahlau-Heinert Date: Sat, 6 Apr 2019 06:10:51 -0400 Subject: [PATCH 1/2] Change order so that release is parsed before version --- pr_tag_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_tag_release.sh b/pr_tag_release.sh index daee869..e4b99dd 100644 --- a/pr_tag_release.sh +++ b/pr_tag_release.sh @@ -229,9 +229,9 @@ status export_pr_num || return 0 check_valid_state || return 0 export_pr_info || return 0 -update_version || return 0 create_release_body +update_version || return 0 set_up_git create_version_tag || return 0 From 85822a1e146e67fd4e290fe2e821d3c76d1a93a0 Mon Sep 17 00:00:00 2001 From: Saejin Mahlau-Heinert Date: Sat, 6 Apr 2019 06:13:46 -0400 Subject: [PATCH 2/2] Add change as synonym for update and bugfix in patch release --- README.md | 2 +- pr_tag_release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf39e3a..0e6aa02 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ the Pull Request, unlike the others, which apply to the body. ```bash DEPLOY_BRANCH=${DEPOY_BRANCH-"^master$"} MERGE_COMMIT_REGEX=${MERGE_COMMIT_REGEX-"Merge pull request #([0-9]+)"} -PATCH_CHANGE_REGEX=${PATCH_CHANGE_REGEX-"This (PR|release) is an?( small| tiny)? (update|bugfix)"} +PATCH_CHANGE_REGEX=${PATCH_CHANGE_REGEX-"This (PR|release) is an?( small| tiny)? (update|bugfix|change)"} MINOR_CHANGE_REGEX=${MINOR_CHANGE_REGEX-"This (PR|release) is a (feature( update| change)?|big (update|change))"} MAJOR_CHANGE_REGEX=${MAJOR_CHANGE_REGEX-"This (PR|release) (is a ((compatibility[ -])?breaking|major) (update|change)| breaks( backwards)? compatibility)"} PRERELEASE_REGEX=${PRERELEASE_REGEX-"\[(PRE|WIP|PRERELEASE)\]"} diff --git a/pr_tag_release.sh b/pr_tag_release.sh index e4b99dd..cbcdcd3 100644 --- a/pr_tag_release.sh +++ b/pr_tag_release.sh @@ -7,7 +7,7 @@ DEPLOY_BRANCH=${DEPOY_BRANCH-"^master$"} MERGE_COMMIT_REGEX=${MERGE_COMMIT_REGEX-"Merge pull request #([0-9]+)"} -PATCH_CHANGE_REGEX=${PATCH_CHANGE_REGEX-"This (PR|release) is an?( small| tiny)? (update|bugfix)"} +PATCH_CHANGE_REGEX=${PATCH_CHANGE_REGEX-"This (PR|release) is an?( small| tiny)? (update|bugfix|change)"} MINOR_CHANGE_REGEX=${MINOR_CHANGE_REGEX-"This (PR|release) is a (feature( update| change)?|big (update|change))"} MAJOR_CHANGE_REGEX=${MAJOR_CHANGE_REGEX-"This (PR|release) (is a ((compatibility[ -])?breaking|major) (update|change)| breaks( backwards)? compatibility)"} PRERELEASE_REGEX=${PRERELEASE_REGEX-"\[(PRE|WIP|PRERELEASE)\]"}