Skip to content

CCM-10160 minor fixes to workflows and precommits #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masl2 merged 7 commits into from
Dec 4, 2025
Merged

CCM-10160 minor fixes to workflows and precommits #157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8ae3bc
CCM-10160 minor fixes to workflows and precommits
aidenvaines-cgi Sep 17, 2025
9333c9c
Merge branch 'main' into CCM-10160_minorFixes
masl2 Oct 28, 2025
ee20f88
Merge branch 'main' into CCM-10160_minorFixes
m-houston Nov 10, 2025
6f56fc2
Merge branch 'main' into CCM-10160_minorFixes
m-houston Nov 20, 2025
1b9c652
Merge branch 'main' into CCM-10160_minorFixes
m-houston Nov 20, 2025
7e7aa9f
Merge branch 'main' into CCM-10160_minorFixes
masl2 Nov 27, 2025
9a30f2b
Merge branch 'main' into CCM-10160_minorFixes
masl2 Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/pr_closed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@ 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"
4 changes: 3 additions & 1 deletion .github/workflows/release_created.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,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"
2 changes: 0 additions & 2 deletions infrastructure/terraform/components/api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ No requirements.
|------|--------|---------|
| <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip | n/a |
| <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v2.0.17 |
| <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.10 |
| <a name="module_kms"></a> [kms](#module\_kms) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/kms | v2.0.10 |
| <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip | n/a |
| <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-kms.zip | n/a |
| <a name="module_logging_bucket"></a> [logging\_bucket](#module\_logging\_bucket) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v2.0.17 |
Expand Down
2 changes: 0 additions & 2 deletions sandbox/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// Use this file as a starting point for your project's .eslintrc.
// Copy this file, and add rule overrides as needed.
{
"extends": "airbnb-base",
"rules": {
Expand Down
1 change: 1 addition & 0 deletions scripts/config/pre-commit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ repos:
args: ['--autofix']
exclude: |
(?x)^(
package(-lock)?\.json$ |
sdk/.* |
someotherdir/.* |
src/server/host/Properties/launchSettings.json
Expand Down
2 changes: 2 additions & 0 deletions scripts/devcontainer/custom-ca-certs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
4 changes: 2 additions & 2 deletions scripts/init.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading