Skip to content

Commit dabf7a5

Browse files
tstephen-nhststephen-nhs
authored
Merge branch 'main' into aea-6056-meta-lastUpdated
2 parents b091e83 + 120ecb9 commit dabf7a5

50 files changed

Lines changed: 1906 additions & 1067 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"streetsidesoftware.code-spell-checker",
3737
"timonwong.shellcheck",
3838
"mkhl.direnv",
39-
"github.vscode-github-actions"
39+
"github.vscode-github-actions",
40+
"sonarsource.sonarlint-vscode"
4041
],
4142
"settings": {
4243
"python.defaultInterpreterPath": "/workspaces/eps-prescription-status-update-api/.venv/bin/python",

‎.github/cfg/ods_codes_int.txt‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,36 @@ FXE88
102102
FXF99
103103
FXH76
104104
FXR02
105+
FAW39
106+
FDE75
107+
FE649
108+
FEA90
109+
FEF40
110+
FFJ22
111+
FFT75
112+
FG718
113+
FHC68
114+
FHL39
115+
FJ346
116+
FJ575
117+
FKT64
118+
FLG01
119+
FLG26
120+
FLL14
121+
FM106
122+
FMP96
123+
FPM71
124+
FPM86
125+
FQ140
126+
FRJ49
127+
FT839
128+
FTW72
129+
FTX15
130+
FV462
131+
FVA24
132+
FVM51
133+
FX385
134+
FXD93
135+
FXH78
136+
FXV31
137+
FXW37

‎.github/cfg/ods_codes_prod.txt‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,36 @@ FXE88
102102
FXF99
103103
FXH76
104104
FXR02
105+
FAW39
106+
FDE75
107+
FE649
108+
FEA90
109+
FEF40
110+
FFJ22
111+
FFT75
112+
FG718
113+
FHC68
114+
FHL39
115+
FJ346
116+
FJ575
117+
FKT64
118+
FLG01
119+
FLG26
120+
FLL14
121+
FM106
122+
FMP96
123+
FPM71
124+
FPM86
125+
FQ140
126+
FRJ49
127+
FT839
128+
FTW72
129+
FTX15
130+
FV462
131+
FVA24
132+
FVM51
133+
FX385
134+
FXD93
135+
FXH78
136+
FXV31
137+
FXW37

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2828
2929
quality_checks:
30-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
3131
needs: [get_asdf_version]
3232
with:
3333
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -46,12 +46,11 @@ jobs:
4646
4747
tag_release:
4848
needs: [quality_checks, get_commit_id, get_asdf_version]
49-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
49+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
5050
with:
5151
dry_run: true
5252
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
5353
branch_name: main
54-
publish_package: false
5554
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
5655
secrets: inherit
5756

‎.github/workflows/pull_request.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
jobs:
1111
dependabot-auto-approve-and-merge:
1212
needs: quality_checks
13-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -32,15 +32,15 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/cfg/settings.yml)
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
quality_checks:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
3636
needs: [get_asdf_version]
3737
with:
3838
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3939
secrets:
4040
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4141

4242
pr_title_format_check:
43-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
43+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
4444

4545
get_issue_number:
4646
runs-on: ubuntu-22.04
@@ -71,12 +71,11 @@ jobs:
7171

7272
tag_release:
7373
needs: [get_asdf_version]
74-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
74+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
7575
with:
7676
dry_run: true
7777
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
7878
branch_name: ${{ github.event.pull_request.head.ref }}
79-
publish_package: false
8079
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
8180
secrets: inherit
8281

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/cfg/settings.yml)
2626
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2727
quality_checks:
28-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
2929
needs: [get_asdf_version]
3030
with:
3131
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -44,12 +44,11 @@ jobs:
4444
4545
tag_release:
4646
needs: [quality_checks, get_commit_id, get_asdf_version]
47-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
4848
with:
4949
dry_run: false
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
5151
branch_name: main
52-
publish_package: false
5352
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
5453
secrets: inherit
5554

‎.github/workflows/run_package_code_and_api.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
asdf_version: ${{ steps.asdf-version.outputs.version }}
2929

3030
- name: Cache asdf
31-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
31+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
3232
with:
3333
path: |
3434
~/.asdf

‎.github/workflows/run_regression_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
asdf_version: ${{ steps.asdf-version.outputs.version }}
5252

5353
- name: Cache asdf
54-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
54+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
5555
with:
5656
path: |
5757
~/.asdf

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
nodejs 20.19.5
1+
nodejs 24.12.0
22
python 3.12.12
33
poetry 1.8.2
44
shellcheck 0.11.0

‎.vscode/eps-prescription-status-update-api.code-workspace‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
"name": "packages/common/middyErrorHandler",
5757
"path": "../packages/common/middyErrorHandler"
5858
},
59+
{
60+
"name": "packages/common/utilities",
61+
"path": "../packages/common/utilities"
62+
},
5963
{
6064
"name": "packages/psuRestoreValidationLambda",
6165
"path": "../packages/psuRestoreValidationLambda"

0 commit comments

Comments
 (0)