Skip to content

Commit ed82499

Browse files
committed
Merge branch 'pr-1413' into ved-000-dependabot-consolidated-1400-1407
Merged PRs: # Conflicts: # package-lock.json # package.json
2 parents 63b81cb + 75a566d commit ed82499

6 files changed

Lines changed: 29 additions & 29 deletions

File tree

.github/workflows/account-terraform.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
113113
- name: Connect to AWS
114114
if: ${{ steps.diff.outputs.account_infra_changed == 'true' }}
115-
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
115+
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37
116116
with:
117117
aws-region: eu-west-2
118118
role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT_ID }}:role/auto-ops
@@ -144,7 +144,7 @@ jobs:
144144

145145
- name: Save Account Terraform Plan
146146
if: ${{ steps.diff.outputs.account_infra_changed == 'true' }}
147-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
147+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
148148
with:
149149
name: ${{ env.ACCOUNT_TERRAFORM_ARTIFACT_NAME }}
150150
path: infrastructure/account/tfplan
@@ -186,7 +186,7 @@ jobs:
186186
ref: ${{ needs.account-terraform-plan.outputs.plan_sha }}
187187

188188
- name: Connect to AWS
189-
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
189+
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37
190190
with:
191191
aws-region: eu-west-2
192192
role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT_ID }}:role/auto-ops

.github/workflows/deploy-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ jobs:
242242
run: make plan-ci
243243

244244
- name: Save Terraform Plan
245-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
245+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
246246
with:
247247
name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-tfplan
248248
path: infrastructure/instance/tfplan

.github/workflows/deploy-lambda-artifact.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ jobs:
438438
echo "manifest_file=${manifest_file}" >> "$GITHUB_OUTPUT"
439439
440440
- name: Upload deployment manifest
441-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
441+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
442442
with:
443443
name: deploy-manifest-${{ inputs.lambda_name }}-${{ inputs.environment }}-${{ inputs.sub_environment }}-${{ github.run_attempt }}
444444
path: ${{ steps.manifest.outputs.manifest_file }}

.github/workflows/run-e2e-automation-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
run: poetry run pytest "$TEST_PATH" -m "$TEST_FILTER" --junitxml=output/test-results.xml --alluredir=output/allure-results
247247

248248
- name: Upload e2e automation test artifact
249-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
249+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
250250
if: always()
251251
with:
252252
name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-${{ env.APIGEE_ENVIRONMENT }}-e2e-test-output

package-lock.json

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"license": "MIT",
1616
"homepage": "https://github.com/NHSDigital/immunisation-fhir-api",
1717
"devDependencies": {
18-
"@redocly/cli": "^2.26.0",
18+
"@redocly/cli": "^2.27.1",
1919
"husky": "^9.1.7",
2020
"lint-staged": "^16.4.0",
21-
"prettier": "^3.8.2"
21+
"prettier": "^3.8.3"
2222
},
2323
"lint-staged": {
2424
"*": "prettier --ignore-unknown --write",

0 commit comments

Comments
 (0)