diff --git a/.github/workflows/documentation.yml b/.github/workflows/docs.yml similarity index 99% rename from .github/workflows/documentation.yml rename to .github/workflows/docs.yml index e115b3c..ea79893 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/docs.yml @@ -1,8 +1,10 @@ name: Generate terraform docs + on: push: branches: - master + jobs: docs: runs-on: ubuntu-latest diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3718903..d2cdff6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,9 +1,10 @@ name: Lint + on: [push] jobs: tflint: - name: TFLint + name: Lint runs-on: ubuntu-latest steps: - uses: actions/checkout@master @@ -19,16 +20,6 @@ jobs: - uses: actions/checkout@master - run: terraform fmt --recursive -check=true - docs: - name: Docs - runs-on: macOS-latest - steps: - - uses: actions/checkout@master - - name: Install Deps - run: brew update && brew install pre-commit terraform-docs terraform - - name: Check Docs - run: pre-commit run --show-diff-on-failure --all-files terraform_docs - validate: name: Validate runs-on: ubuntu-latest @@ -60,7 +51,7 @@ jobs: name: Minimum version check runs-on: ubuntu-latest container: - image: hashicorp/terraform:0.12.20 + image: hashicorp/terraform:0.12.0 steps: - uses: actions/checkout@master - name: Validate Code diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 4d7fc9f..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -repos: - - repo: git://github.com/antonbabenko/pre-commit-terraform - rev: v1.25.0 - hooks: - - id: terraform_fmt - - id: terraform_docs - - id: terraform_validate - - id: terraform_tflint \ No newline at end of file diff --git a/versions.tf b/versions.tf index b4b567e..cd0f691 100644 --- a/versions.tf +++ b/versions.tf @@ -1,3 +1,3 @@ terraform { - required_version = ">= 0.12.20" -} + required_version = ">= 0.12.0" +} \ No newline at end of file