Skip to content

Commit

Permalink
Merge pull request #52 from trussworks/ee-cleanup
Browse files Browse the repository at this point in the history
cleaning up version strings and ci config
  • Loading branch information
eeeady authored Dec 28, 2020
2 parents 051bc0e + 9b23919 commit deea893
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
4 changes: 1 addition & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
- auth:
password: $DOCKER_PASSWORD
username: $DOCKER_USERNAME
image: trussworks/circleci:6986bb9022e5a83599feb66a7128a2d0fa12732a
image: trussworks/circleci:efb1042e31538677779971798e0912390f699e72
steps:
- checkout
- restore_cache:
Expand All @@ -17,8 +17,6 @@ jobs:
key: pre-commit-dot-cache-{{ checksum ".pre-commit-config.yaml" }}
paths:
- ~/.cache/pre-commit
references:
circleci: trussworks/circleci:6986bb9022e5a83599feb66a7128a2d0fa12732a
version: 2.1
workflows:
validate:
Expand Down
8 changes: 4 additions & 4 deletions .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.2.0
rev: v3.4.0
hooks:
- id: check-json
- id: check-merge-conflict
Expand All @@ -12,17 +12,17 @@ repos:
- id: trailing-whitespace

- repo: git://github.com/igorshubovych/markdownlint-cli
rev: v0.23.2
rev: v0.26.0
hooks:
- id: markdownlint

- repo: git://github.com/antonbabenko/pre-commit-terraform
rev: v1.37.0
rev: v1.45.0
hooks:
- id: terraform_docs
- id: terraform_fmt

- repo: git://github.com/golangci/golangci-lint
rev: v1.31.0
rev: v1.33.0
hooks:
- id: golangci-lint
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ module "aws_mfa" {

| Name | Version |
|------|---------|
| terraform | ~> 0.13.0 |
| aws | ~> 3 |
| terraform | => 0.13.0 |
| aws | => 3 |

## Providers

| Name | Version |
|------|---------|
| aws | ~> 3 |
| aws | => 3 |

## Inputs

Expand Down
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 0.13.0"
required_version = "=> 0.13.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 3"
version = "=> 3"
}
}
}

0 comments on commit deea893

Please sign in to comment.