Skip to content

Commit 6470913

Browse files
committed
chore: Update repo configuration files for destination organization
1 parent b633323 commit 6470913

File tree

5 files changed

+43
-10
lines changed

5 files changed

+43
-10
lines changed

.github/.gitkeep

Whitespace-only changes.

.github/workflows/lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
lock:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: dessant/lock-threads@v3
11+
- uses: dessant/lock-threads@v4
1212
with:
1313
github-token: ${{ secrets.GITHUB_TOKEN }}
1414
issue-comment: >

.github/workflows/pre-commit.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
env:
1010
TERRAFORM_DOCS_VERSION: v0.16.0
11+
TFLINT_VERSION: v0.44.1
1112

1213
jobs:
1314
collectInputs:
@@ -46,6 +47,7 @@ jobs:
4647
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
4748
with:
4849
terraform-version: ${{ steps.minMax.outputs.minVersion }}
50+
tflint-version: ${{ env.TFLINT_VERSION }}
4951
args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*'
5052

5153
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
@@ -54,6 +56,7 @@ jobs:
5456
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
5557
with:
5658
terraform-version: ${{ steps.minMax.outputs.minVersion }}
59+
tflint-version: ${{ env.TFLINT_VERSION }}
5760
args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)'
5861

5962
preCommitMaxVersion:
@@ -75,5 +78,6 @@ jobs:
7578
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
7679
with:
7780
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
81+
tflint-version: ${{ env.TFLINT_VERSION }}
7882
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}
7983
install-hcledit: true
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
name: Release
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- main
8+
- master
9+
paths:
10+
- '**/*.tpl'
11+
- '**/*.py'
12+
- '**/*.tf'
13+
- '.github/workflows/release.yml'
714

815
jobs:
916
release:
1017
name: Release
1118
runs-on: ubuntu-latest
19+
# Skip running release workflow on forks
20+
if: github.repository_owner == 'terraform-aws-modules'
1221
steps:
1322
- name: Checkout
1423
uses: actions/checkout@v3
1524
with:
16-
fetch-depth: 0
1725
persist-credentials: false
18-
19-
- name: Setup Node.js
20-
uses: actions/setup-node@v3
21-
with:
22-
node-version: 16
26+
fetch-depth: 0
2327

2428
- name: Release
2529
uses: cycjimmy/semantic-release-action@v3
@@ -30,4 +34,4 @@ jobs:
3034
@semantic-release/git@10.0.0
3135
conventional-changelog-conventionalcommits@4.6.3
3236
env:
33-
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE }}
37+
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}

.releaserc.json

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"branches": [
3-
"main"
3+
"main",
4+
"master"
45
],
6+
"ci": false,
57
"plugins": [
68
[
79
"@semantic-release/commit-analyzer",
@@ -15,6 +17,29 @@
1517
"preset": "conventionalcommits"
1618
}
1719
],
18-
"@semantic-release/github"
20+
[
21+
"@semantic-release/github",
22+
{
23+
"successComment": "This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version ${nextRelease.version} :tada:",
24+
"labels": false,
25+
"releasedLabels": false
26+
}
27+
],
28+
[
29+
"@semantic-release/changelog",
30+
{
31+
"changelogFile": "CHANGELOG.md",
32+
"changelogTitle": "# Changelog\n\nAll notable changes to this project will be documented in this file."
33+
}
34+
],
35+
[
36+
"@semantic-release/git",
37+
{
38+
"assets": [
39+
"CHANGELOG.md"
40+
],
41+
"message": "chore(release): version ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
42+
}
43+
]
1944
]
2045
}

0 commit comments

Comments
 (0)