Skip to content

Commit

Permalink
Revert "Improve handling of tf plugin cache in tests (#885)" (#886)
Browse files Browse the repository at this point in the history
This reverts commit af447e3.
  • Loading branch information
ludoo committed Oct 14, 2022
1 parent 3ed5d29 commit b39abd2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 28 deletions.
27 changes: 4 additions & 23 deletions .github/workflows/tests.yml
Expand Up @@ -54,11 +54,13 @@ jobs:
terraform_version: ${{ env.TF_VERSION }}
terraform_wrapper: false

- name: Config Terraform plugin cache and initialize providers
- name: Config Terraform plugin cache
run: |
echo 'plugin_cache_dir="$HOME/.terraform.d/plugin-cache"' >~/.terraformrc
mkdir --parents ~/.terraform.d/plugin-cache
sed -i -e '/# CI hook/e cat tests/test-versions.tf' default-versions.tf
- name: Initialize providers
run: |
terraform init
# avoid conflicts with user-installed providers on local machines
Expand Down Expand Up @@ -105,13 +107,6 @@ jobs:
run: |
terraform init
- name: Config Terraform plugin cache and initialize providers
run: |
echo 'plugin_cache_dir="$HOME/.terraform.d/plugin-cache"' >~/.terraformrc
mkdir --parents ~/.terraform.d/plugin-cache
sed -i -e '/# CI hook/e cat tests/test-versions.tf' default-versions.tf
terraform init
# avoid conflicts with user-installed providers on local machines
- name: Pin provider versions
run: |
Expand Down Expand Up @@ -156,13 +151,6 @@ jobs:
run: |
terraform init
- name: Config Terraform plugin cache and initialize providers
run: |
echo 'plugin_cache_dir="$HOME/.terraform.d/plugin-cache"' >~/.terraformrc
mkdir --parents ~/.terraform.d/plugin-cache
sed -i -e '/# CI hook/e cat tests/test-versions.tf' default-versions.tf
terraform init
# avoid conflicts with user-installed providers on local machines
- name: Pin provider versions
run: |
Expand Down Expand Up @@ -207,13 +195,6 @@ jobs:
run: |
terraform init
- name: Config Terraform plugin cache and initialize providers
run: |
echo 'plugin_cache_dir="$HOME/.terraform.d/plugin-cache"' >~/.terraformrc
mkdir --parents ~/.terraform.d/plugin-cache
sed -i -e '/# CI hook/e cat tests/test-versions.tf' default-versions.tf
terraform init
# avoid conflicts with user-installed providers on local machines
- name: Pin provider versions
run: |
Expand Down
9 changes: 8 additions & 1 deletion default-versions.tf
Expand Up @@ -23,7 +23,14 @@ terraform {
source = "hashicorp/google-beta"
version = ">= 4.36.0" # tftest
}
# CI hook
# used in modules
archive = {
source = "hashicorp/archive"
}
# used in fast
local = {
source = "hashicorp/local"
}
}
}

Expand Down
4 changes: 0 additions & 4 deletions tests/test-versions.tf

This file was deleted.

0 comments on commit b39abd2

Please sign in to comment.