Skip to content

Commit e87b534

Browse files
authored
Merge pull request #35 from alphagov/tf-action-update
ENG-1075: Use new versions of github actions
2 parents a3c110a + 3c74623 commit e87b534

File tree

8 files changed

+13
-2192
lines changed

8 files changed

+13
-2192
lines changed

.github/workflows/validate.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@ on:
1010

1111
permissions:
1212
contents: read
13-
pull-requests: write
1413

1514
jobs:
16-
pre-commit-checks:
17-
uses: alphagov/gds-github-workflows/.github/workflows/terraform-pre-commit-checks.yml@29b2abf32227088428af98e8a9278d62e6dd0c93 # v0.0.7
18-
permissions:
19-
contents: read
20-
with:
21-
terraform-version: ${{ vars.TERRAFORM_VERSION || null }} # defined by reusable workflow if not set
15+
pre-commit:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
21+
- name: Install terraform and dependencies
22+
uses: alphagov/gds-github-workflows/terraform/deps@1596944bd569e4838c1a1d5e8f71cf82e9021bf9 # v0.1.2
23+
24+
- name: Run pre-commit
25+
uses: alphagov/gds-github-workflows/pre-commit@1596944bd569e4838c1a1d5e8f71cf82e9021bf9 # v0.1.2

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ windows_*/
1111
*.tfstate.*
1212

1313
# terraform lock file
14-
#.terraform.lock.hcl
14+
.terraform.lock.hcl
1515

1616
# Crash log files
1717
crash.log

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ repos:
7878
- --args=--config=.terraform-docs.yml
7979

8080
- id: terraform_validate
81-
name: Terraform validate examples
81+
name: Terraform validate modules
8282
args:
8383
- --args=-json
8484
- --args=-no-color

.trivyignore

Whitespace-only changes.

azurerm-conditional-access/.terraform.lock.hcl

Lines changed: 0 additions & 22 deletions
This file was deleted.

azurerm-conditional-access/examples/basic/.terraform.lock.hcl

Lines changed: 0 additions & 42 deletions
This file was deleted.

msgraph-entra-domain/.terraform.lock.hcl

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)