Merge branch 'main' into release/v1.0.0

.github/workflows/test.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches:
       - master
+      - develop
       - release/*
+      - hotfix/*
 
   pull_request:
     types:

README.md

@@ -7,7 +7,7 @@
 ![GitHub license](https://img.shields.io/github/license/jortfal/semantic-release-terraform-config)
 ![Maintenance](https://img.shields.io/maintenance/yes/2021?color=green)
 ![Maintainer](https://img.shields.io/badge/maintainer-jortfal-green)
-[![Build Status](https://github.com/jortfal/semantic-release-terraform-config/workflows/Test/badge.svg)](https://github.com/jortfal/semantic-release-terraform-config/actions?query=workflow%3ATest+branch%3Amaster) [![npm latest version](https://img.shields.io/npm/v/jortfal/semantic-release-terraform-config/latest.svg)](https://www.npmjs.com/package/jortfal/semantic-release-terraform-config)
+[![Build Status](https://github.com/jortfal/semantic-release-terraform-config/workflows/Test/badge.svg)](https://github.com/jortfal/semantic-release-terraform-config/actions?query=workflow%3ATest+branch%3Amaster) [![npm latest version](https://img.shields.io/npm/v/@jortfal/semantic-release-terraform-config/latest.svg)](https://www.npmjs.com/package/jortfal/semantic-release-terraform-config)
 
 ## Plugins
 

index.js

@@ -14,7 +14,13 @@ limitations under the License.
 module.exports = {
   plugins: [
     '@semantic-release/commit-analyzer',
+    {
+      preset: 'conventionalcommits',
+    },
     '@semantic-release/release-notes-generator',
+    {
+      preset: 'conventionalcommits',
+    },
     '@semantic-release/github',
     '@semantic-release/changelog',
     [
@@ -23,8 +29,8 @@ module.exports = {
         replacements: [
           {
             files: ['locals.tf'],
-            from: `"Terraform Module Version" = ".*"`,
-            to: `"Terraform Module Version" = "\${nextRelease.version}"`,
+            from: `"Terraform Module Version"    = ".*"`,
+            to: `"Terraform Module Version"    = "\${nextRelease.gitTag}"`,
             results: [
               {
                 file: 'locals.tf',
@@ -42,7 +48,7 @@ module.exports = {
       '@semantic-release/git',
       {
         assets: ['locals.tf', 'CHANGELOG.md'],
-        message: `chore(release): \${nextRelease.version} [skip ci]\n\n\${nextRelease.notes}`,
+        message: `chore(release): \${nextRelease.gitTag} [skip ci]\n\n\${nextRelease.notes}`,
       },
     ],
   ],