Skip to content

Commit 20045e1

Browse files
authored
Merge pull request #6 from scribd/cidev
Enable semantic-release workflow
2 parents ba59c19 + c1493c7 commit 20045e1

File tree

3 files changed

+48
-25
lines changed

3 files changed

+48
-25
lines changed

.github/workflows/terraform.yml renamed to .github/workflows/terraform_and_release.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
name: 'Terraform GitHub Actions'
1+
name: 'Terraform and Release'
22
on:
33
push:
4-
branches:
5-
- master
64
pull_request:
7-
branches:
8-
- master
95
jobs:
106
terraform:
117
name: 'Terraform'
@@ -48,3 +44,20 @@ jobs:
4844
tf_actions_subcommand: 'validate'
4945
env:
5046
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
release:
48+
if: github.event_name == 'push'
49+
needs: terraform
50+
runs-on: ubuntu-latest
51+
52+
steps:
53+
- uses: actions/checkout@v2
54+
- name: Semantic Release
55+
id: semantic
56+
uses: cycjimmy/semantic-release-action@v2
57+
env:
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59+
with:
60+
semantic_version: 17
61+
extra_plugins: |
62+
@semantic-release/changelog
63+
@semantic-release/git

README.md

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ There are two main components:
1111
- Forward Kinesis data stream events to Datadog, only CloudWatch logs are supported
1212
- Forward custom metrics from AWS Lambda functions via CloudWatch logs
1313
- Forward traces from AWS Lambda functions via CloudWatch logs
14-
- Generate and submit enhanced Lambda metrics (aws.lambda.enhanced.*) parsed from the AWS REPORT log: duration, billed_duration, max_memory_used, and estimated_cost
14+
- Generate and submit enhanced Lambda metrics (`aws.lambda.enhanced.*`) parsed from the AWS REPORT log: duration, billed_duration, max_memory_used, and estimated_cost
1515

1616

1717
## Usage
@@ -66,35 +66,23 @@ Cloudwatch log sync are namspaced by module.
6666

6767
## Examples
6868

69-
* [Full AWS Datadog integration](https://github.com/scribd/terraform-aws-datadog/tree/master/examples/full_integration)
70-
* [Cloudwatch log sync only](https://github.com/scribd/terraform-aws-datadog/tree/master/examples/cloudwatch_log_sync)
69+
- [Full AWS Datadog integration](https://github.com/scribd/terraform-aws-datadog/tree/master/examples/full_integration)
70+
- [Cloudwatch log sync only](https://github.com/scribd/terraform-aws-datadog/tree/master/examples/cloudwatch_log_sync)
7171

7272

7373
## Development
7474

75-
Releases are cut using [go-semrel-gitlab](https://gitlab.com/juhani/go-semrel-gitlab)
75+
Releases are cut using [semantic-release](https://github.com/semantic-release/semantic-release).
7676

77-
Format commit messages using [Conventional Commits format](https://www.conventionalcommits.org/en/v1.0.0-beta.2/) to determine the next version bump and to produce release notes
77+
Please write commit messages following [Angular commit guidelines](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines)
7878

79-
```
80-
type(scope): subject
81-
```
82-
or
8379

84-
```
85-
type: subject
86-
```
87-
88-
Types:
89-
```
90-
minor bump: feat
91-
patch bump: fix,refactor,perf,docs,style,tes
92-
```
80+
### Release flow
9381

94-
When a commit contains a breaking change, the commit message should contain `BREAKING CHANGE:`
82+
Semantic-release is configured with the [default branch workflow](https://semantic-release.gitbook.io/semantic-release/usage/configuration#branches)
9583

84+
For this project, releases will be cut from master as features and bugs are developed.
9685

97-
## Cutting a release
9886

9987
### Maintainers
10088
- [Jim](https://github.com/jim80net)

release.config.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
module.exports = {
2+
"plugins": [
3+
"@semantic-release/commit-analyzer",
4+
"@semantic-release/release-notes-generator",
5+
[
6+
"@semantic-release/changelog",
7+
{
8+
"changelogFile": "CHANGELOG.md"
9+
}
10+
],
11+
"@semantic-release/github",
12+
[
13+
"@semantic-release/git",
14+
{
15+
"assets": [
16+
"CHANGELOG.md"
17+
],
18+
"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
19+
}
20+
]
21+
]
22+
};

0 commit comments

Comments
 (0)