Skip to content

Commit d1f5be6

Browse files
Merge pull request #12 from terraform-module/chore/inline-with-blueprint
inline with blueprint project
2 parents 48e96fb + e7a5f85 commit d1f5be6

File tree

10 files changed

+170
-165
lines changed

10 files changed

+170
-165
lines changed

.chglog/CHANGELOG.tpl.md

Lines changed: 0 additions & 51 deletions
This file was deleted.

.chglog/config.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/settings.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# These settings are synced to GitHub by https://probot.github.io/apps/settings/
2+
_extends: .github
3+
4+
repository:
5+
# See https://developer.github.com/v3/repos/#edit for all available settings.
6+
name: terraform-helm-release
7+
description: "ℹ️ App release with terraform and helm."
8+
homepage: https://ivankatliarchuk.github.io
9+
topics: ivank, terraform, terraform-module, helm, kubernetes
10+
private: false
11+
has_issues: true
12+
has_projects: false
13+
has_wiki: false
14+
has_downloads: false
15+
has_pages: true
16+
is_template: true
17+
default_branch: master
18+
allow_squash_merge: true
19+
allow_merge_commit: true
20+
allow_rebase_merge: true
21+
delete_branch_on_merge: true
22+
enable_automated_security_fixes: true
23+
enable_vulnerability_alerts: false
24+
25+
branches:
26+
- name: master

.github/workflows/linter.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
name: linter
3+
# This workflow is triggered on pushes to the repository.
4+
on:
5+
push:
6+
pull_request:
7+
branches:
8+
- main
9+
- master
10+
workflow_dispatch:
11+
12+
jobs:
13+
terraform-validate:
14+
name: code format
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@master
18+
# https://github.com/hashicorp/setup-terraform
19+
- uses: hashicorp/setup-terraform@v2
20+
21+
- name: Cache terraform folder
22+
uses: actions/cache@v2
23+
with:
24+
path: ./.terraform
25+
key: terraform
26+
27+
- name: terraform fmt
28+
run: terraform fmt -check -recursive -diff
29+
continue-on-error: true
30+
31+
- name: terraform init
32+
run: terraform init
33+
34+
- name: terraform validate
35+
run: terraform validate
36+
37+
tflint:
38+
name: "tflint"
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@v2
42+
- uses: actions/cache@v2
43+
name: Cache tflint plugin dir
44+
with:
45+
path: ~/.tflint.d/plugins
46+
key: ${{ matrix.os }}-tflint-${{ hashFiles('.tflint.hcl') }}
47+
- uses: terraform-linters/setup-tflint@v1
48+
name: setup tflint
49+
- name: init tflint
50+
run: tflint --init --config .tflint.hcl
51+
- name: run tflint
52+
run: tflint -f compact --config .tflint.hcl

.github/workflows/main.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/pr-title.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: 'validate-pr-title'
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- edited
8+
- synchronize
9+
10+
jobs:
11+
main:
12+
name: validate pr title
13+
runs-on: ubuntu-latest
14+
steps:
15+
# Please look up the latest version from
16+
# https://github.com/amannn/action-semantic-pull-request/releases
17+
- uses: amannn/[email protected]
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20+
with:
21+
# Configure which types are allowed.
22+
# Default: https://github.com/commitizen/conventional-commit-types
23+
types: |
24+
fix
25+
feat
26+
docs
27+
ci
28+
chore
29+
# Configure that a scope must always be provided.
30+
requireScope: false
31+
# If `subjectPattern` is configured, you can use this property to override
32+
# the default error message that is shown when the pattern doesn't match.
33+
# The variables `subject` and `title` can be used within the message.
34+
subjectPatternError: |
35+
The subject "{subject}" found in the pull request title "{title}"
36+
didn't match the configured pattern. Please ensure that the subject
37+
starts with an uppercase character.
38+
# For work-in-progress PRs you can typically use draft pull requests
39+
# from Github. However, private repositories on the free plan don't have
40+
# this option and therefore this action allows you to opt-in to using the
41+
# special "[WIP]" prefix to indicate this state. This will avoid the
42+
# validation of the PR title and the pull request checks remain pending.
43+
# Note that a second check will be reported if this is enabled.
44+
wip: true
45+
# When using "Squash and merge" on a PR with only one commit, GitHub
46+
# will suggest using that commit message instead of the PR title for the
47+
# merge commit, and it's easy to commit this by mistake. Enable this option
48+
# to also validate the commit message for one commit PRs.
49+
validateSingleCommit: false

.github/workflows/release.draft.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,49 @@
1+
---
12
name: release.draft
23

34
on:
5+
push:
6+
branches:
7+
- master
48
workflow_dispatch:
59
inputs:
610
prerelease:
711
description: Is this a pre-release
812
required: true
913
default: true
14+
type: boolean
1015
publish:
1116
description: Publish release
1217
required: false
1318
default: false
19+
type: boolean
1420
bump:
1521
description: 'Bumping (#major, #minor or #patch)'
1622
required: false
1723
default: patch
24+
type: choice
25+
options:
26+
- 'patch'
27+
- 'minor'
28+
- 'major'
1829

1930
jobs:
2031
draft-a-release:
2132
runs-on: ubuntu-latest
2233
steps:
2334

24-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v3
2536

2637
- name: check next version
27-
uses: anothrNick/github-tag-action@1.35.0
38+
uses: anothrNick/github-tag-action@1.39.0
2839
id: tag
2940
env:
3041
DRY_RUN: true
3142
WITH_V: true
3243
DEFAULT_BUMP: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.bump || 'patch' }}
3344

3445
- name: release-draft
35-
uses: release-drafter/release-drafter@v5.15.0
46+
uses: release-drafter/release-drafter@v5.20.0
3647
if: "!contains(github.event.head_commit.message, 'skip')"
3748
id: release
3849
env:

.github/workflows/release.yaml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.0.1
3+
rev: v4.3.0
44
hooks:
55
- id: check-added-large-files
66
args: ['--maxkb=500']
77
- id: check-executables-have-shebangs
88
- id: pretty-format-json
9-
args: ['--autofix', '--no-sort-keys', '--indent=4']
9+
args: ['--autofix', '--no-sort-keys', '--indent=2']
1010
- id: check-byte-order-marker
1111
- id: check-case-conflict
1212
- id: check-executables-have-shebangs
@@ -16,13 +16,9 @@ repos:
1616
- id: check-merge-conflict
1717
- id: detect-aws-credentials
1818
args: ['--allow-missing-credentials']
19-
- repo: git://github.com/antonbabenko/pre-commit-terraform
20-
rev: v1.50.0
19+
- repo: https://github.com/antonbabenko/pre-commit-terraform
20+
rev: v1.73.0
2121
hooks:
2222
- id: terraform_fmt
2323
- id: terraform_docs
2424
- id: terraform_tflint
25-
- repo: https://github.com/smian/pre-commit-makefile.git
26-
rev: 261f8fb4b31dfdc05d1a1d7fbde1f1462ecde66d
27-
hooks:
28-
- id: makefile-doc

0 commit comments

Comments
 (0)