From 5109d7e6aaa5c95ff1765403118e0c2bc50f85a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Christian=20Winther-S=C3=B8rensen?= Date: Tue, 26 Mar 2024 15:31:19 +0100 Subject: [PATCH] TEST-1234 Add emoji changes --- .githooks/commit-msg | 6 ++---- .githooks/config.sh | 4 ++-- .github/PULL_REQUEST_TEMPLATE.md | 31 +++++++++++++++++++++---------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/.githooks/commit-msg b/.githooks/commit-msg index 6bdefbb8..a2bd0fe5 100644 --- a/.githooks/commit-msg +++ b/.githooks/commit-msg @@ -30,15 +30,13 @@ $DEV_BRANCH) $MAIN_BRANCH) error_msg="Aborting commit. Please prefix JIRA issue (${JIRA_TAG}-XXXX) and a verb ${IMPERATIVE_VERBS} to the commit message." - commit_regex_string="^${JIRA_TAG}-[0-9]+ ${IMPERATIVE_VERBS} [A-Za-z0-9 \/\'\,\._-]+$" + commit_regex_string="^${JIRA_TAG}-[0-9]+ ${IMPERATIVE_VERBS} .*$" ;; \ *) error_msg="Aborting commit. Please prefix JIRA issue (${JIRA_TAG}-XXXX) and a verb ${IMPERATIVE_VERBS} to the commit message." - commit_regex_string="^${JIRA_TAG}-[0-9]+ ${IMPERATIVE_VERBS} [A-Za-z0-9 \/\'\,\._-]+$" - # echo "Unhandled branch value $current_branch" - # exit 1 + commit_regex_string="^${JIRA_TAG}-[0-9]+ ${IMPERATIVE_VERBS} .*$" ;; esac diff --git a/.githooks/config.sh b/.githooks/config.sh index 018a6ed0..81a7d5de 100644 --- a/.githooks/config.sh +++ b/.githooks/config.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash JIRA_TAG="TEST" -BRANCH_PREFIXES="(feature|bugfix)" -IMPERATIVE_VERBS="(Add|Change|Remove|Fix|Update|Bump|Merge)" +BRANCH_PREFIXES="(feature|๐ŸŒฟ|bugfix|๐Ÿชฒ)" +IMPERATIVE_VERBS="(Add|โž•|Change|๐ŸŒŠ|Remove|๐ŸŒ…|Fix|๐Ÿชฒ|Update|โš’๏ธ|Bump|๐Ÿค›|Merge|๐Ÿ™ˆ)" diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e02676b8..3d702f0b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,34 +1,45 @@ -## Description +## Description ๐Ÿ’ฌ -## Motivation and Context +## Motivation and Context ๐Ÿฅ… -## How has this been tested? +## How has this been tested? ๐Ÿงช -- [ ] Local build -- [ ] Local tests -- [ ] (optional) Local run and endpoint tested in swagger +- [ ] Local build โš’๏ธ +- [ ] Local tests ๐Ÿงช +- [ ] (optional) Local run and endpoint tested in swagger ๐Ÿš€ -## Screenshots (if appropriate) +## Screenshots (if appropriate) ๐Ÿ’ป -## Types of changes +## Types of changes ๐ŸŒŠ - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -## Checklist +## Checklist โ˜‘๏ธ + - [ ] The pull request title starts with the jira case number (when applicable), e.g. "TEST-1234 Add some feature" - [ ] The person responsible for following up on requested review changes has been assigned to the pull request - [ ] My code follows the code style of this project. -- [ ] I've added *create-diagram* or similar labels to generate extra PR artifacts to assist reviewers - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. + +## Highly optional checks, only use these if you have a reason to do so โœ”๏ธ + +- [ ] This PR changes the database so I have added the *create-diagram* label to assist reviewers with a db diagram +- [ ] This PR changes platform or backend and I need others to be able to test against these changes before merging to dev, so I have added the *deploy-azure* label to deploy before merging the PR + +## Checklist for the approver โœ… + +- [ ] I've checked the files view for spelling issues, code quality warnings and similar +- [ ] I've waited until all checks have passed (green check/without error) +- [ ] I've checked that only the intended files are changed