Skip to content
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
Comment thread
tdroza-nhs marked this conversation as resolved.
File renamed without changes.
3 changes: 1 addition & 2 deletions .github/workflows/cicd-1-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@ jobs:
APP_CLIENT_ID: ${{ secrets.APP_CLIENT_ID }}
publish-stage: # Recommended maximum execution time is 10 minutes
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be better moved to pr_closed? There it will only run on main and after the acceptance tests have run.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reason I've kept it here, is so i can push direct to main on a fork, and have this go through. otherwise on a fork when testing CICD to GHP, you would have to do your own pr to yourself.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should be making compromises to support forks.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestion on how to support forks?

Copy link
Copy Markdown
Contributor

@Ian-Hodges Ian-Hodges Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this isolated example you can amend the workflow on the forked repo.
It's not supporting forks, no. If you want full fork support I think it would be best to move it out to its own repo.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think this is a wider conversation to fully move the publish stage out of here. Probably need to look at how our repository template (https://github.com/NHSDigital/nhs-notify-repository-template/tree/main/.github/workflows) is different from the NHSE template (https://github.com/nhs-england-tools/repository-template/tree/main/.github/workflows), in that we don't have the separate publish workflow, and that to get around that for this to be able to publish its just in https://github.com/NHSDigital/nhs-notify-digital-letters/blob/main/.github/workflows/cicd-1-pull-request.yaml instead.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would like to suggest that removing this at present is a breaking changes for a fork, so to leave it in. Then will look separately at bringing in the workflow "2 publish" and look at fully moving the publish stage out of this workflow?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to leave this as-is while we decide on the best place for it.

name: "Publish stage"
needs: [metadata, acceptance-stage] #PUT THIS BACK WHEN ACCEPTANCE STAGE IS ENABLED
#needs: [metadata, build-stage] BYPASSING ACCEPTANCE STAGE
needs: [metadata, build-stage]
uses: ./.github/workflows/stage-5-publish.yaml
if: (github.event_name == 'push' && github.ref == 'refs/heads/main')
with:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
act 0.2.64
gitleaks 8.24.0
jq 1.6
nodejs 24.10.0
nodejs 22.11.0
pre-commit 3.6.0
python 3.13.2
terraform 1.10.1
Expand Down
10 changes: 10 additions & 0 deletions docs/.tool-versions
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of all these .tool-versions files. Do these packages need node 24?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unsure if they will play ball with 22. I do think this is the point of tools versions though so can do monorepo support for tools versioning?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure it works well with npm workspaces and make where most commands are ran from the root directory. If you are keeping them, I presume you don't need all those tools i.e. terraform stuff?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most of the make uses make -C so it runs child ones from their directory. Have gone through and removed all redundant lines. Was a good spot though as the template doesn't proactively install child tools versions - something that we've missed as there is an existing tool-versions nested in there. Have done a separate pr to backport changes - see change to init.mk

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
act 0.2.64
gitleaks 8.24.0
jq 1.6
nodejs 24.10.0
pre-commit 3.6.0
python 3.13.2
terraform 1.10.1
terraform-docs 0.19.0
trivy 0.61.0
vale 3.6.0
10 changes: 10 additions & 0 deletions src/.tool-versions
Comment thread
tdroza-nhs marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
act 0.2.64
gitleaks 8.24.0
jq 1.6
nodejs 24.10.0
pre-commit 3.6.0
python 3.13.2
terraform 1.10.1
terraform-docs 0.19.0
trivy 0.61.0
vale 3.6.0
13 changes: 13 additions & 0 deletions src/README.md
Comment thread
RossBugginsNHS marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Schema Generation

Owner: RossBugginsNHS
Author: Claude Sonnet 4.5
Date: November 2025

## Summary

The code within here is for generating json schemas for the source yaml schemas.

[src/cloudevents/domains/digital-letters/2025-10-draft](src/cloudevents/domains/digital-letters/2025-10-draft) is where the source for the schemas is located.

At build time they will be generated and outputted to the docs folder, ready for deployment to github pages.
18 changes: 0 additions & 18 deletions src/cloudevents/.tool-versions
Comment thread
tdroza-nhs marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,3 @@ terraform 1.10.1
terraform-docs 0.19.0
trivy 0.61.0
vale 3.6.0


# ==============================================================================
# The section below is reserved for Docker image versions.

# Move this section - consider using a different file for the repository template dependencies.
# docker/ghcr.io/anchore/grype v0.92.2@sha256:651e558f9ba84f2a790b3449c8a57cbbf4f34e004f7d3f14ae8f8cbeede4cd33 # SEE: https://github.com/anchore/grype/pkgs/container/grype
# docker/ghcr.io/anchore/syft v1.26.0@sha256:de078f51704a213906970b1475edd6006b8af50aa159852e125518237487b8c6 # SEE: https://github.com/anchore/syft/pkgs/container/syft
# docker/ghcr.io/gitleaks/gitleaks:v8.24.0@sha256:b8e9bf46893c2f20e10bfb4b2e783adaef519dea981b01ca6221ac325e836040 # SEE: https://github.com/gitleaks/gitleaks/pkgs/container/gitleaks
# docker/ghcr.io/igorshubovych/markdownlint-cli v0.37.0@sha256:fb3e79946fce78e1cde84d6798c6c2a55f2de11fc16606a40d49411e281d950d # SEE: https://github.com/igorshubovych/markdownlint-cli/pkgs/container/markdownlint-cli
# docker/ghcr.io/make-ops-tools/gocloc latest@sha256:6888e62e9ae693c4ebcfed9f1d86c70fd083868acb8815fe44b561b9a73b5032 # SEE: https://github.com/make-ops-tools/gocloc/pkgs/container/gocloc
# docker/ghcr.io/nhs-england-tools/github-runner-image 20230909-321fd1e-rt@sha256:ce4fd6035dc450a50d3cbafb4986d60e77cb49a71ab60a053bb1b9518139a646 # SEE: https://github.com/nhs-england-tools/github-runner-image/pkgs/container/github-runner-image
# docker/hadolint/hadolint 2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 # SEE: https://hub.docker.com/r/hadolint/hadolint/tags
# docker/hashicorp/terraform 1.5.6@sha256:180a7efa983386a27b43657ed610e9deed9e6c3848d54f9ea9b6cb8a5c8c25f5 # SEE: https://hub.docker.com/r/hashicorp/terraform/tags
# docker/jdkato/vale v3.6.0@sha256:0ef22c8d537f079633cfff69fc46f69a2196072f69cab1ab232e8a79a388e425 # SEE: https://hub.docker.com/r/jdkato/vale/tags
# docker/koalaman/shellcheck latest@sha256:e40388688bae0fcffdddb7e4dea49b900c18933b452add0930654b2dea3e7d5c # SEE: https://hub.docker.com/r/koalaman/shellcheck/tags
# docker/mstruebing/editorconfig-checker 2.7.1@sha256:dd3ca9ea50ef4518efe9be018d669ef9cf937f6bb5cfe2ef84ff2a620b5ddc24 # SEE: https://hub.docker.com/r/mstruebing/editorconfig-checker/tags
# docker/sonarsource/sonar-scanner-cli 11.3@sha256:7462f132388135e32b948f8f18ff0db9ae28a87c6777f1df5b2207e04a6d7c5c # SEE: https://hub.docker.com/r/sonarsource/sonar-scanner-cli/tags
8 changes: 4 additions & 4 deletions src/eventcatalog/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/eventcatalog/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@eventcatalog/core": "2.64.3"
"@eventcatalog/core": "2.64.4"
Comment thread
tdroza-nhs marked this conversation as resolved.
},
"devDependencies": {
"http-server": "^14.1.1"
Expand All @@ -11,7 +11,7 @@
"build": "npx eventcatalog build --",
"dev": "npx eventcatalog dev --",
"generate": "eventcatalog generate",
"preview": "eventcatalog preview",
"preview": "eventcatalog preview -- --host",
Comment thread
tdroza-nhs marked this conversation as resolved.
"start": "eventcatalog start",
"test": "echo \"Error: no test specified\" && exit 1"
},
Expand Down