From 3f0a63c823147a7c55b2b2fbd7a67af82ab8d6e0 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 10 Jul 2024 09:31:36 -0400 Subject: [PATCH] chore(deps): bump to tf 1.9.2 (#4741) Signed-off-by: Rui Chen --- .github/workflows/test.yml | 18 +++++++++--------- Dockerfile | 4 ++-- testing/Dockerfile | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d1a8bc80e..07b009785 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,8 +3,8 @@ name: tester on: push: branches: - - 'main' - - 'release-**' + - "main" + - "release-**" pull_request: types: - opened @@ -12,8 +12,8 @@ on: - synchronize - ready_for_review branches: - - 'main' - - 'release-**' + - "main" + - "release-**" concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -106,7 +106,7 @@ jobs: # dont run e2e tests on forked PRs if: github.event.pull_request.head.repo.fork == false env: - TERRAFORM_VERSION: 1.8.3 + TERRAFORM_VERSION: 1.9.2 ATLANTIS_GH_USER: ${{ secrets.ATLANTISBOT_GITHUB_USERNAME }} ATLANTIS_GH_TOKEN: ${{ secrets.ATLANTISBOT_GITHUB_TOKEN }} NGROK_AUTH_TOKEN: ${{ secrets.ATLANTISBOT_NGROK_AUTH_TOKEN }} @@ -126,10 +126,10 @@ jobs: - name: Setup ngrok run: | - wget -q -nc https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz - tar -xzf ngrok-v3-stable-linux-amd64.tgz && \ - chmod +x ngrok - ./ngrok --help + wget -q -nc https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz + tar -xzf ngrok-v3-stable-linux-amd64.tgz && \ + chmod +x ngrok + ./ngrok --help - name: Setup gitconfig run: | git config --global user.email "maintainers@runatlantis.io" diff --git a/Dockerfile b/Dockerfile index ede1e5c20..e641a6146 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_TAG=12.6-slim@sha256:f528891ab1aa484bf7233dbcc84f3c806c3e427571d75510 ARG GOLANG_TAG=1.22.5-alpine@sha256:8c9183f715b0b4eca05b8b3dbf59766aaedb41ec07477b132ee2891ac0110a07 # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp -ARG DEFAULT_TERRAFORM_VERSION=1.8.5 +ARG DEFAULT_TERRAFORM_VERSION=1.9.2 # renovate: datasource=github-releases depName=opentofu/opentofu versioning=hashicorp ARG DEFAULT_OPENTOFU_VERSION=1.7.2 # renovate: datasource=github-releases depName=open-policy-agent/conftest @@ -122,7 +122,7 @@ RUN ./download-release.sh \ "terraform" \ "${TARGETPLATFORM}" \ "${DEFAULT_TERRAFORM_VERSION}" \ - "1.5.7 1.6.6 1.7.5 ${DEFAULT_TERRAFORM_VERSION}" \ + "1.6.6 1.7.5 1.8.5 ${DEFAULT_TERRAFORM_VERSION}" \ && ./download-release.sh \ "tofu" \ "${TARGETPLATFORM}" \ diff --git a/testing/Dockerfile b/testing/Dockerfile index 2fa6a354c..b6a739ae0 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install unzip \ # Install Terraform # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp -ENV TERRAFORM_VERSION=1.8.5 +ENV TERRAFORM_VERSION=1.9.2 RUN case $(uname -m) in x86_64|amd64) ARCH="amd64" ;; aarch64|arm64|armv7l) ARCH="arm64" ;; esac && \ wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_${ARCH}.zip && \ mkdir -p /usr/local/bin/tf/versions/${TERRAFORM_VERSION} && \