From e9eb55c3db30de60e03901bdc6b666aa5cac5231 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 5 Jul 2023 14:52:27 +0000 Subject: [PATCH 1/3] chore: pin terraform to 1.5.2 The Alpine ARM builders are no longer behind on releases. --- scripts/Dockerfile.base | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index c24970ef2cac3..60785b6e5d797 100644 --- a/scripts/Dockerfile.base +++ b/scripts/Dockerfile.base @@ -13,11 +13,8 @@ RUN apk add --no-cache \ git \ openssh-client && \ # Use the edge repo, since Terraform doesn't seem to be backported to 3.18. - # TODO: remove =~ - # For some reason alpine's ARM builders are offline, so ARM builds will have - # to fall back to 1.5.0. apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \ - terraform=~1.5-r0 && \ + terraform=1.5.2-r0 && \ addgroup \ -g 1000 \ coder && \ From eea7438cf96e5a238aa992074ebaee8b0960bc2b Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 5 Jul 2023 14:59:48 +0000 Subject: [PATCH 2/3] fixup! chore: pin terraform to 1.5.2 --- .github/actions/setup-tf/action.yaml | 11 +++++++++++ .github/workflows/ci.yaml | 24 ++++-------------------- .github/workflows/nightly-gauntlet.yaml | 6 +----- 3 files changed, 16 insertions(+), 25 deletions(-) create mode 100644 .github/actions/setup-tf/action.yaml diff --git a/.github/actions/setup-tf/action.yaml b/.github/actions/setup-tf/action.yaml new file mode 100644 index 0000000000000..831a30e9ed80a --- /dev/null +++ b/.github/actions/setup-tf/action.yaml @@ -0,0 +1,11 @@ +name: "Setup Go" +description: | + Sets up Terraform for tests, builds, etc. +runs: + using: "composite" + steps: + - name: Install Terraform + uses: hashicorp/setup-terraform@v2 + with: + terraform_version: 1.5.2 + terraform_wrapper: false diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4cf9e83af6333..975ba7e7ad328 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -231,11 +231,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-go - - - uses: hashicorp/setup-terraform@v2 - with: - terraform_version: 1.5.1 - terraform_wrapper: false + - uses: ./.github/actions/setup-tf - name: Test with Mock Database id: test @@ -296,11 +292,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-go - - - uses: hashicorp/setup-terraform@v2 - with: - terraform_version: 1.5.1 - terraform_wrapper: false + - uses: ./.github/actions/setup-tf - name: Test with PostgreSQL Database run: | @@ -340,11 +332,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-go - - - uses: hashicorp/setup-terraform@v2 - with: - terraform_version: 1.5.1 - terraform_wrapper: false + - uses: ./.github/actions/setup-tf - name: Run Tests run: | @@ -479,11 +467,7 @@ jobs: - uses: ./.github/actions/setup-node - uses: ./.github/actions/setup-go - - - uses: hashicorp/setup-terraform@v2 - with: - terraform_version: 1.5.1 - terraform_wrapper: false + - uses: ./.github/actions/setup-tf - name: Build run: | diff --git a/.github/workflows/nightly-gauntlet.yaml b/.github/workflows/nightly-gauntlet.yaml index 0f4c8fcb3bdcb..0cc00b0d7acf0 100644 --- a/.github/workflows/nightly-gauntlet.yaml +++ b/.github/workflows/nightly-gauntlet.yaml @@ -19,11 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-go - - - uses: hashicorp/setup-terraform@v2 - with: - terraform_version: 1.1.9 - terraform_wrapper: false + - uses: ./.github/actions/setup-tf - name: Run Tests run: | From 464dc4550c3809033711ab0cb7ffecfa3cfa3d8e Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 5 Jul 2023 19:16:20 +0300 Subject: [PATCH 3/3] Update .github/actions/setup-tf/action.yaml --- .github/actions/setup-tf/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-tf/action.yaml b/.github/actions/setup-tf/action.yaml index 831a30e9ed80a..a4f66300960f8 100644 --- a/.github/actions/setup-tf/action.yaml +++ b/.github/actions/setup-tf/action.yaml @@ -1,4 +1,4 @@ -name: "Setup Go" +name: "Setup Terraform" description: | Sets up Terraform for tests, builds, etc. runs: