From 2720ac31340dd0772177df0eb6f11090a0b0d2e3 Mon Sep 17 00:00:00 2001 From: Matt White <16320656+matt-FFFFFF@users.noreply.github.com> Date: Thu, 27 Feb 2025 09:14:27 +0000 Subject: [PATCH 1/2] fix: makefile and introduce test --- .github/workflows/avm-makefile.yaml | 18 ++++++++++++++++++ avmmakefile | 8 ++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/avm-makefile.yaml diff --git a/.github/workflows/avm-makefile.yaml b/.github/workflows/avm-makefile.yaml new file mode 100644 index 0000000..ef16138 --- /dev/null +++ b/.github/workflows/avm-makefile.yaml @@ -0,0 +1,18 @@ +name: AVM makefile + +on: + pull_request: + branches: + - main + workflow_dispatch: + + +jobs: + makefile: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 + - name: makefile + run: | + make -f avmmakefile help diff --git a/avmmakefile b/avmmakefile index 99b0983..b49fc67 100644 --- a/avmmakefile +++ b/avmmakefile @@ -1,5 +1,9 @@ REMOTE_SCRIPT := https://raw.githubusercontent.com/Azure/tfmod-scaffold/main/avm_scripts$(AVMSCRIPT_VERSION) +.PHONY: help +help: + @echo "please use 'make '" + .PHONY: conftest conftest: curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/conftest.sh" | bash @@ -66,11 +70,11 @@ pr-check: fmtcheck docscheck tfvalidatecheck lint unit-test integration-test .PHONY: unit-test unit-test: - curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-terraform-test.sh" | bash -s -- unit + curl -H 'Cache-Control\: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-terraform-test.sh" | bash -s -- unit .PHONY: integration-test integration-test: - curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-terraform-test.sh" | bash -s -- integration + curl -H 'Cache-Control\: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-terraform-test.sh" | bash -s -- integration .PHONY: test-example test-example: From 822e698997b45363cbba1f2a0946c71613482de2 Mon Sep 17 00:00:00 2001 From: Matt White <16320656+matt-FFFFFF@users.noreply.github.com> Date: Thu, 27 Feb 2025 09:16:23 +0000 Subject: [PATCH 2/2] chore: change to tabs --- avmmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/avmmakefile b/avmmakefile index b49fc67..bb6b92a 100644 --- a/avmmakefile +++ b/avmmakefile @@ -70,11 +70,11 @@ pr-check: fmtcheck docscheck tfvalidatecheck lint unit-test integration-test .PHONY: unit-test unit-test: - curl -H 'Cache-Control\: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-terraform-test.sh" | bash -s -- unit + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-terraform-test.sh" | bash -s -- unit .PHONY: integration-test integration-test: - curl -H 'Cache-Control\: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-terraform-test.sh" | bash -s -- integration + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-terraform-test.sh" | bash -s -- integration .PHONY: test-example test-example: