Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/automerge 1 #53

Merged
merged 3 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto_assignee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:
jobs:
assignee:
uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.0.6
uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.0.10
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
---
name: Auto merge
on:
pull_request:
jobs:
auto-merge:
uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@1.0.9
uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@1.0.10
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
tfcheck: 'tf-checks-spot-example / Get min/max versions'
tfcheck: 'tf-checks-on-demand-example / Check code format'
...
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
jobs:
changelog:
uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.0.6
uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.0.10
secrets: inherit
with:
branch: 'master'
12 changes: 6 additions & 6 deletions .github/workflows/readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@ on:
push:
branches:
- master

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

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

- name: 'create readme'
uses: 'clouddrove/github-actions@v9.0.3'
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@v3.0.0
continue-on-error: true
Expand All @@ -34,7 +34,7 @@ jobs:
continue-on-error: true

- name: 'push readme'
uses: 'clouddrove/github-actions@v9.0.3'
uses: 'clouddrove/github-actions@9.0.3'
continue-on-error: true
with:
actions_subcommand: 'push'
Expand All @@ -50,4 +50,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
if: always()
if: always()
4 changes: 2 additions & 2 deletions .github/workflows/tf-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ on:
workflow_dispatch:
jobs:
tf-checks-on-demand-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.6
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.10
with:
working_directory: './_example/on-demand/'
tf-checks-spot-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.6
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.10
with:
working_directory: './_example/spot/'

Expand Down
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.6
uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@1.0.10
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.6
uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.0.10
secrets: inherit
with:
working_directory: '.'
44 changes: 0 additions & 44 deletions _example/on-demand/.terraform.lock.hcl

This file was deleted.

4 changes: 2 additions & 2 deletions _example/on-demand/versions.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Terraform version
terraform {
required_version = ">= 1.6.1"
required_version = ">= 1.6.6"

required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.21.0"
version = ">= 5.31.0"
}
}
}
44 changes: 0 additions & 44 deletions _example/spot/.terraform.lock.hcl

This file was deleted.

4 changes: 2 additions & 2 deletions _example/spot/versions.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Terraform version
terraform {
required_version = ">= 1.6.1"
required_version = ">= 1.6.6"

required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.21.0"
version = ">= 5.31.0"
}
}
}
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Terraform version
terraform {
required_version = ">= 1.6.1"
required_version = ">= 1.6.6"

required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.21.0"
version = ">= 5.31.0"
}
}
}