diff --git a/.github/workflows/pr_closed.yaml b/.github/workflows/pr_closed.yaml index ebaeaf0d4..1c6c8c1e6 100644 --- a/.github/workflows/pr_closed.yaml +++ b/.github/workflows/pr_closed.yaml @@ -61,7 +61,9 @@ jobs: --targetEnvironment "main" \ --targetAccountGroup "nhs-notify-supplier-api-dev" \ --targetComponent "${{ matrix.component }}" \ - --terraformAction "apply" + --terraformAction "apply" \ + --overrideProjectName "nhs" \ + --overrideRoleName "nhs-main-acct-supplier-api-github-deploy" check-event-schemas-version-change: name: Check for event schemas package version change diff --git a/.github/workflows/release_created.yaml b/.github/workflows/release_created.yaml index 7960e23cc..f7525dfb4 100644 --- a/.github/workflows/release_created.yaml +++ b/.github/workflows/release_created.yaml @@ -37,4 +37,6 @@ jobs: --targetEnvironment "main" \ --targetAccountGroup "nhs-notify-supplier-api-nonprod" \ --targetComponent "${{ matrix.component }}" \ - --terraformAction "apply" + --terraformAction "apply" \ + --overrideProjectName "nhs" \ + --overrideRoleName "nhs-main-acct-supplier-api-github-deploy" diff --git a/scripts/init.mk b/scripts/init.mk index e12255c34..c42cf2bf7 100644 --- a/scripts/init.mk +++ b/scripts/init.mk @@ -46,8 +46,8 @@ _install-dependency: # Install asdf dependency - mandatory: name=[listed in the asdf install ${name} $(or ${version},) _install-dependencies: # Install all the dependencies listed in .tool-versions - for plugin in $$(grep ^[a-z] .tool-versions | sed 's/[[:space:]].*//'); do - make _install-dependency name="$${plugin}" + for plugin in $$(grep '^[a-z]' .tool-versions | cut -f1 -d' '); do \ + echo "Installing $${plugin}..."; \ done clean:: # Remove all generated and temporary files (common) @Operations