Skip to content

Commit

Permalink
Merge pull request #31 from trussworks/cg_pin
Browse files Browse the repository at this point in the history
Pin tf version to 0.12 family. Update pre-commit.
  • Loading branch information
Chris Gilmer authored Aug 13, 2020
2 parents 5dcca00 + 04343bd commit a5d5215
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2
version: 2.1

references:
circleci_docker_primary: &circleci_docker_primary trussworks/circleci-docker-primary:683f06a3c6b20ba8696a09632c1c26a532df5bf5
circleci_docker_primary: &circleci_docker_primary trussworks/circleci-docker-primary:822fac1c30f3bb7d5d595bed5d2dc86265c4f2f0

jobs:
validate:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: git://github.com/pre-commit/pre-commit-hooks
rev: v3.1.0
rev: v3.2.0
hooks:
- id: check-merge-conflict
- id: check-yaml
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module "bootstrap" {

| Name | Version |
|------|---------|
| terraform | >= 0.12 |
| terraform | ~> 0.12.0 |

## Providers

Expand Down
3 changes: 1 addition & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

terraform {
required_version = ">= 0.12"
required_version = "~> 0.12.0"
}

0 comments on commit a5d5215

Please sign in to comment.