Skip to content

Commit

Permalink
Merge pull request #421 from plus3it/revert-410-dependabot/github_act…
Browse files Browse the repository at this point in the history
…ions/softprops/action-gh-release-2.2.0

Installs terraform explicitly in build workflow
  • Loading branch information
lorengordon authored Dec 23, 2024
2 parents 94e4e65 + 3fc5f67 commit 770bbef
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,15 @@ jobs:
mkdir -p ./${{ env.REPO_PATH }}/terraform-registry
aws s3 sync --no-sign-request --exact-timestamps --endpoint-url ${{ env.MIRROR_ENDPOINT }} s3://${{ env.MIRROR_BUCKET }}/repo/terraform-registry/ ./${{ env.REPO_PATH }}/terraform-registry/
- name: Install terraform binary
run: |
make terraform/install
- name: Create Terraform registry
run: |
terraform -chdir=./providers/ providers mirror \
"${HOME}"/bin/terraform -chdir=./providers/ providers mirror \
-platform=linux_amd64 \
-platform=linux_arm64 \
-platform=windows_amd64 \
-platform=darwin_amd64 \
../${{ env.REPO_PATH }}/terraform-registry/
Expand All @@ -109,7 +114,7 @@ jobs:
}
}
EOF
terraform -chdir=./providers/ init
"${HOME}"/bin/terraform -chdir=./providers/ init
- name: Push mirror to s3 bucket
if: github.event_name != 'pull_request'
Expand Down
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pull_request_rules:
- name: approve dependabot pull requests without build workflow
conditions:
- author~=dependabot\[bot\]
- -files~=^(Dockerfile.tools|\.github/workflows/build\.yml|providers/)
- -files~=^(Dockerfile.tools|\.github/workflows/build\.yml|\.github/workflows/dependabot_hack\.yml|providers/)
actions:
review:
type: APPROVE
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tools
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

FROM hashicorp/packer:1.11.2 as packer

FROM hashicorp/terraform:1.10.1 as terraform
FROM hashicorp/terraform:1.10.3 as terraform
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include $(shell test -f .tardigrade-ci || curl -sSL -o .tardigrade-ci "https://raw.githubusercontent.com/plus3it/tardigrade-ci/master/bootstrap/Makefile.bootstrap"; echo .tardigrade-ci)

export MIRROR_DOCKERFILE_TOOLS ?= Dockerfile.tools
export MIRROR_GITHUB_TOOLS ?= $(PWD)/.github/workflows/dependabot_hack.yml

Expand All @@ -11,6 +9,8 @@ export TERRAFORM_VERSION_REPO_PATH ?= $(REPO_DIR)/terraform/$(TERRAFORM_VERSION)
export TERRAGRUNT_VERSION ?= v$(call match_pattern_in_file,$(MIRROR_GITHUB_TOOLS),'gruntwork-io/terragrunt','$(SEMVER_PATTERN)')
export TERRAGRUNT_VERSION_REPO_PATH ?= $(REPO_DIR)/terragrunt/$(TERRAGRUNT_VERSION)

include $(shell test -f .tardigrade-ci || curl -sSL -o .tardigrade-ci "https://raw.githubusercontent.com/plus3it/tardigrade-ci/master/bootstrap/Makefile.bootstrap"; echo .tardigrade-ci)

$(REPO_DIR)/%:
@ echo "[make]: Creating directory '$@'..."
mkdir -p $@
Expand Down
2 changes: 1 addition & 1 deletion providers/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "registry.terraform.io/hashicorp/aws"
version = "5.80.0"
version = "5.82.2"
}
external = {
source = "registry.terraform.io/hashicorp/external"
Expand Down

0 comments on commit 770bbef

Please sign in to comment.