Skip to content

Commit a2a50c7

Browse files
RossFaulds171RossFaulds171
committed
Merge branch 'main' into feature/CCM-12185-addGetMiEndpoint 
2 parents 0197178 + fea176d commit a2a50c7

22 files changed

Lines changed: 137 additions & 108 deletions

‎.github/actions/acceptance-tests-components/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ runs:
2929
GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
3030

3131
- name: Fetch terraform output
32-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
32+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
3333
with:
3434
name: terraform-output-${{ inputs.targetComponent }}
3535

‎.github/actions/build-docs/action.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ runs:
1111
using: "composite"
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
15-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
14+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
15+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1616
with:
1717
node-version: 22
1818
registry-url: 'https://npm.pkg.github.com'
@@ -23,15 +23,15 @@ runs:
2323
run: npm ci
2424
shell: bash
2525
- name: Setup Ruby
26-
uses: ruby/setup-ruby@3783f195e29b74ae398d7caca108814bbafde90e # v1.180.1
26+
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
2727
with:
2828
ruby-version: "3.2" # Not needed with a .ruby-version file
2929
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
3030
cache-version: 0 # Increment this number if you need to re-download cached gems
3131
working-directory: "./docs"
3232
- name: Setup Pages
3333
id: pages
34-
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
34+
uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
3535
- name: Build with Jekyll
3636
working-directory: ./docs
3737
# Outputs to the './_site' directory by default
@@ -43,7 +43,7 @@ runs:
4343

4444
- name: Upload artifact
4545
# Automatically uploads an artifact from the './_site' directory by default
46-
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
46+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
4747
with:
4848
path: "docs/_site/"
4949
name: jekyll-docs-${{ inputs.version }}

‎.github/actions/build-libraries/action.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ runs:
1111
using: "composite"
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
15-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
14+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
15+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1616
with:
1717
node-version: 22
1818
registry-url: 'https://npm.pkg.github.com'
@@ -31,40 +31,40 @@ runs:
3131
make build VERSION="${{ inputs.version }}"
3232
3333
- name: Upload abstractions artifact
34-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
34+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
3535
with:
3636
path: "src/server/abstractions/bin/Release"
3737
name: libs-abstractions-${{ inputs.version }}
3838
include-hidden-files: true
3939

4040
- name: Upload data artifact
41-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
41+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4242
with:
4343
path: "src/server/data/bin/Release"
4444
name: libs-data-${{ inputs.version }}
4545
include-hidden-files: true
4646

4747
- name: Upload letter artifact
48-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
48+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4949
with:
5050
path: "src/server/letter/bin/Release"
5151
name: libs-letter-${{ inputs.version }}
5252
include-hidden-files: true
5353

5454
- name: Upload host artifact
55-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
55+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5656
with:
5757
path: "src/server/host/bin/Release"
5858
name: libs-host-${{ inputs.version }}
5959
include-hidden-files: true
6060

6161
- name: Set up Docker Buildx
62-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
62+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
6363
- run: mkdir -p ${{ runner.temp }}/myimage
6464
shell: bash
6565

6666
- name: Build and export
67-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
67+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
6868
with:
6969
context: src/server
7070
file: src/server/Dockerfile
@@ -74,7 +74,7 @@ runs:
7474
outputs: type=docker,dest=${{ runner.temp }}/myimage/myimage.tar
7575

7676
- name: Upload artifact
77-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
77+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7878
with:
7979
name: libs-host-docker-${{ inputs.version }}
8080
path: ${{ runner.temp }}/myimage

‎.github/actions/build-oas-spec/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ runs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
28-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
27+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2929
with:
3030
node-version: ${{ inputs.nodejs_version }}
3131
registry-url: 'https://npm.pkg.github.com'
3232

3333
- name: "Cache node_modules"
34-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
34+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
3535
with:
3636
path: |
3737
**/node_modules
@@ -68,7 +68,7 @@ runs:
6868
fi
6969
7070
- name: Upload API OAS specification artifact
71-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
71+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7272
with:
7373
path: "build"
7474
name: api-oas-specification-${{ inputs.apimEnv }}${{ inputs.version != '' && format('-{0}', inputs.version) || '' }}

‎.github/actions/build-proxies/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ runs:
3636
steps:
3737
- name: Download OAS Spec artifact from workflow
3838
if: ${{ inputs.isRelease == 'false' }}
39-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
39+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
4040
with:
4141
name: api-oas-specification-${{ inputs.apimEnv }}${{ inputs.version != '' && format('-{0}', inputs.version) || '' }}
4242
path: ./build
@@ -83,7 +83,7 @@ runs:
8383
echo "APIM_ENV=$APIM_ENV" >> $GITHUB_ENV
8484
8585
- name: Upload OAS Spec
86-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
86+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8787
with:
8888
name: ${{ env.APIM_ENV }}-build-output
8989
path: ./build

‎.github/actions/build-sandbox/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ runs:
1313

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
17-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1818
with:
1919
node-version: 22
2020
registry-url: 'https://npm.pkg.github.com'

‎.github/actions/build-sdk/action.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ runs:
1111
using: "composite"
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
15-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
14+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
15+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1616
with:
1717
node-version: 22
1818
registry-url: 'https://npm.pkg.github.com'
@@ -56,43 +56,43 @@ runs:
5656
make build VERSION="${{ inputs.version }}"
5757
5858
- name: Upload html artifact
59-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
59+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6060
with:
6161
path: "sdk/html"
6262
name: sdk-html-${{ inputs.version }}
6363

6464
- name: Upload swagger artifact
65-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
65+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6666
with:
6767
path: "sdk/swagger"
6868
name: sdk-swagger-${{ inputs.version }}
6969

7070
- name: Upload ts artifact
71-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
71+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7272
with:
7373
path: "sdk/typescript"
7474
name: sdk-ts-${{ inputs.version }}
7575

7676
- name: Upload python artifact
77-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
77+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7878
with:
7979
path: "sdk/python"
8080
name: sdk-python-${{ inputs.version }}
8181

8282
- name: Upload csharp artifact
83-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
83+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8484
with:
8585
path: "sdk/csharp"
8686
name: sdk-csharp-${{ inputs.version }}
8787

8888
- name: Upload artifact
89-
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
89+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
9090
with:
9191
path: "sdk/html/"
9292
name: sdk-html-docs-${{ inputs.version }}
9393

9494
- name: Upload swagger pages artifact
95-
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
95+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
9696
with:
9797
path: "sdk/swagger/"
9898
name: sdk-swagger-docs-${{ inputs.version }}

‎.github/actions/build-server/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ runs:
1111
using: "composite"
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
15-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
14+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
15+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1616
with:
1717
node-version: 22
1818
registry-url: 'https://npm.pkg.github.com'
@@ -36,13 +36,13 @@ runs:
3636
make build VERSION="${{ inputs.version }}"
3737
3838
- name: Upload csharp-server artifact
39-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
39+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4040
with:
4141
path: "server/csharp-server"
4242
name: server-csharp-${{ inputs.version }}
4343

4444
- name: Upload csharp-server docker artifact
45-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
45+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4646
with:
4747
path: "server/Dockerfile"
4848
name: server-csharp-docker-${{ inputs.version }}

‎.github/actions/node-install/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: 'composite'
1111
steps:
1212
- name: 'Use Node.js'
13-
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
13+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1414
with:
1515
node-version-file: '.tool-versions'
1616
registry-url: 'https://npm.pkg.github.com'

‎.github/scripts/dispatch_internal_repo_workflow.sh‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ if [[ -z "$extraSecretNames" ]]; then
224224
extraSecretNames=""
225225
fi
226226

227-
if [{ -z "$tableName" }]; then
227+
if [[ -z "$tableName" ]]; then
228228
tableName=""
229229
fi
230230

@@ -306,17 +306,21 @@ echo "[INFO] Triggering workflow '$targetWorkflow' in nhs-notify-internal..."
306306

307307
echo "[DEBUG] Dispatch event payload: $DISPATCH_EVENT"
308308

309-
trigger_response=$(curl -s -L \
310-
--fail \
309+
trigger_http_code=$(curl -s -L \
310+
-o /tmp/dispatch_response.json \
311+
-w "%{http_code}" \
311312
-X POST \
312313
-H "Accept: application/vnd.github+json" \
313314
-H "Authorization: Bearer ${PR_TRIGGER_PAT}" \
314315
-H "X-GitHub-Api-Version: 2022-11-28" \
315316
"https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/workflows/$targetWorkflow/dispatches" \
316-
-d "$DISPATCH_EVENT" 2>&1)
317+
-d "$DISPATCH_EVENT")
317318

318-
if [[ $? -ne 0 ]]; then
319-
echo "[ERROR] Failed to trigger workflow. Response: $trigger_response"
319+
trigger_response=$(cat /tmp/dispatch_response.json)
320+
321+
if [[ "$trigger_http_code" -lt 200 || "$trigger_http_code" -ge 300 ]]; then
322+
echo "[ERROR] Failed to trigger workflow. HTTP status: $trigger_http_code"
323+
echo "[ERROR] Response body: $trigger_response"
320324
exit 1
321325
fi
322326

0 commit comments

Comments
 (0)