Skip to content

Commit

Permalink
Merge pull request #5 from terraform-do-modules/feat/auto-merge
Browse files Browse the repository at this point in the history
feat: added automerge and updated the workflows
  • Loading branch information
d4kverma authored Feb 1, 2024
2 parents 78050d4 + ad3193f commit acd788c
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/auto_assignee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:

workflow_dispatch:
jobs:
assign-pr:
uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.0.8
assignee:
uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.2.1
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Auto merge
on:
pull_request:
jobs:
auto-merge:
uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@1.2.1
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
tfcheck: 'tf-checks-complete-example / Check code format'
...
9 changes: 5 additions & 4 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: changelog
permissions: write-all
on:
Expand All @@ -7,8 +8,8 @@ on:
workflow_dispatch:
jobs:
changelog:
uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.0.8
secrets:
GITHUB: ${{ secrets.GITHUB }}
uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.2.1
secrets: inherit
with:
branch: 'master'
branch: 'master'
...
14 changes: 7 additions & 7 deletions .github/workflows/readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,36 @@ on:
- master

jobs:
readme-create:
readme:
name: 'readme-create'
runs-on: ubuntu-latest
steps:
- name: 'Checkout'
uses: actions/checkout@1.0.8
uses: actions/checkout@master

- name: 'Set up Python 3.7'
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: 'create readme'
uses: 'clouddrove/github-actions@v9.0.2'
uses: 'clouddrove/github-actions@9.0.3'
with:
actions_subcommand: 'readme'
github_token: '${{ secrets.GITHUB }}'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: 'pre-commit check errors'
uses: pre-commit/action@v2.0.0
uses: pre-commit/action@v3.0.0
continue-on-error: true

- name: 'pre-commit fix erros'
uses: pre-commit/action@v2.0.0
uses: pre-commit/action@v3.0.0
continue-on-error: true

- name: 'push readme'
uses: 'clouddrove/github-actions@v9.0.2'
uses: 'clouddrove/github-actions@9.0.3'
continue-on-error: true
with:
actions_subcommand: 'push'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tf-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ on:
pull_request:
workflow_dispatch:
jobs:
tf-complete-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.8
tf-checks-complete-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.1
with:
working_directory: './_examples/complete/'

tf-basic-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.8
tf-checks-basic-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.1
with:
working_directory: './_examples/basic/'

tf-database-firewall-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.8
tf-checks-database-firewall-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.1
with:
working_directory: './_examples/database-firewall/'
2 changes: 1 addition & 1 deletion .github/workflows/tflint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ on:
workflow_dispatch:
jobs:
tf-lint:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@1.0.8
uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@1.2.1
secrets:
GITHUB: ${{ secrets.GITHUB }}
2 changes: 1 addition & 1 deletion .github/workflows/tfsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:
jobs:
tfsec:
uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.0.8
uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.2.1
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
Expand Down

0 comments on commit acd788c

Please sign in to comment.