From f4a287dced65f09beb64f74e4e0239f53ce39041 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 12 Oct 2018 00:10:15 -0400 Subject: [PATCH 1/5] Better version control --- .travis.yml | 3 ++- examples/eks_test_fixture/main.tf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74c40e3..e525c78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,8 @@ before_script: - export TF_VAR_region=${AWS_REGION} - echo "using AWS_REGION=${AWS_REGION}" - export TF_WARN_OUTPUT_ERRORS=1 -- curl --silent --output terraform.zip https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip +- export LATEST_TERRAFORM_VERSION=$(curl -s https://api.github.com/repos/hashicorp/terraform/releases/latest | grep tag_name | cut -d '"' -f 4) +- curl --silent --output terraform.zip https://releases.hashicorp.com/terraform/${LATEST_TERRAFORM_VERSION}/terraform_${LATEST_TERRAFORM_VERSION}_linux_amd64.zip - sha256sum terraform.zip | grep "84ccfb8e13b5fce63051294f787885b76a1fedef6bdbecf51c5e586c9e20c9b7" - unzip terraform.zip ; rm -f terraform.zip; chmod +x terraform - mkdir -p ${HOME}/bin ; export PATH=${PATH}:${HOME}/bin; mv terraform ${HOME}/bin/ diff --git a/examples/eks_test_fixture/main.tf b/examples/eks_test_fixture/main.tf index 88f9fe3..29f3c77 100644 --- a/examples/eks_test_fixture/main.tf +++ b/examples/eks_test_fixture/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "= 0.11.8" + required_version = ">= 0.11.8" } provider "aws" { From b6f6c39684400be4df53b6a5c7f1e2cfb66d8932 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 12 Oct 2018 00:16:48 -0400 Subject: [PATCH 2/5] Remove `v` in `v0.11.8` --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e525c78..80ca131 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_script: - export TF_VAR_region=${AWS_REGION} - echo "using AWS_REGION=${AWS_REGION}" - export TF_WARN_OUTPUT_ERRORS=1 -- export LATEST_TERRAFORM_VERSION=$(curl -s https://api.github.com/repos/hashicorp/terraform/releases/latest | grep tag_name | cut -d '"' -f 4) +- export LATEST_TERRAFORM_VERSION=$(curl -s https://api.github.com/repos/hashicorp/terraform/releases/latest | grep tag_name | cut -d '"' -f 4 | cut -c2-) - curl --silent --output terraform.zip https://releases.hashicorp.com/terraform/${LATEST_TERRAFORM_VERSION}/terraform_${LATEST_TERRAFORM_VERSION}_linux_amd64.zip - sha256sum terraform.zip | grep "84ccfb8e13b5fce63051294f787885b76a1fedef6bdbecf51c5e586c9e20c9b7" - unzip terraform.zip ; rm -f terraform.zip; chmod +x terraform From 39dbaf2e117fc7f73dc1b53ee86075def06a4dca Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 12 Oct 2018 00:20:08 -0400 Subject: [PATCH 3/5] Move env vars into env section --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80ca131..d5f79aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,12 @@ services: rvm: - 2.4.2 +env: + global: + - AWS_REGION='us-east-1' + - TF_VAR_region=${AWS_REGION} + - TF_WARN_OUTPUT_ERRORS=1 + before_install: - echo "before_install" @@ -17,11 +23,6 @@ install: - bundle install before_script: -- echo 'before_script' -- export AWS_REGION='us-east-1' -- export TF_VAR_region=${AWS_REGION} -- echo "using AWS_REGION=${AWS_REGION}" -- export TF_WARN_OUTPUT_ERRORS=1 - export LATEST_TERRAFORM_VERSION=$(curl -s https://api.github.com/repos/hashicorp/terraform/releases/latest | grep tag_name | cut -d '"' -f 4 | cut -c2-) - curl --silent --output terraform.zip https://releases.hashicorp.com/terraform/${LATEST_TERRAFORM_VERSION}/terraform_${LATEST_TERRAFORM_VERSION}_linux_amd64.zip - sha256sum terraform.zip | grep "84ccfb8e13b5fce63051294f787885b76a1fedef6bdbecf51c5e586c9e20c9b7" From b8bc4114fcb07ea3e3b49d4cb50ca079be378e72 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 12 Oct 2018 00:31:55 -0400 Subject: [PATCH 4/5] Ruby ver `2.4.2` -> `2.4.4` --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 8e8299d..79a6144 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.2 +2.4.4 diff --git a/.travis.yml b/.travis.yml index d5f79aa..5c14d71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ services: - docker rvm: -- 2.4.2 +- 2.4.4 env: global: diff --git a/Gemfile b/Gemfile index 4252e7c..89be253 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ # frozen_string_literal: true -ruby '2.4.2' +ruby '2.4.4' source 'https://rubygems.org/' do gem 'awspec', '~> 1.4.2' From fa0eacedfdb51fbec8ca858bf17402e0a5e3bdb3 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 23 Oct 2018 20:03:29 -0400 Subject: [PATCH 5/5] remove the checksum step --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c14d71..39c135f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ install: before_script: - export LATEST_TERRAFORM_VERSION=$(curl -s https://api.github.com/repos/hashicorp/terraform/releases/latest | grep tag_name | cut -d '"' -f 4 | cut -c2-) - curl --silent --output terraform.zip https://releases.hashicorp.com/terraform/${LATEST_TERRAFORM_VERSION}/terraform_${LATEST_TERRAFORM_VERSION}_linux_amd64.zip -- sha256sum terraform.zip | grep "84ccfb8e13b5fce63051294f787885b76a1fedef6bdbecf51c5e586c9e20c9b7" - unzip terraform.zip ; rm -f terraform.zip; chmod +x terraform - mkdir -p ${HOME}/bin ; export PATH=${PATH}:${HOME}/bin; mv terraform ${HOME}/bin/ - terraform -v