Skip to content

Commit 6a9ef5d

Browse files
harrim91harrim91
committed
CCM-11029: revert testing changes
1 parent 2088251 commit 6a9ef5d

File tree

8 files changed

+62
-71
lines changed

8 files changed

+62
-71
lines changed

‎.github/workflows/pr_closed.yaml‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,36 @@ jobs:
3131
echo "Job not triggered by workflow_dispatch or Merged PR - Skipping 'deploy-main'"
3232
fi
3333
34-
# deploy-main:
35-
# needs: check-merge-or-workflow-dispatch
36-
# name: Deploy changes to main in dev AWS account
37-
# runs-on: ubuntu-latest
38-
# if: needs.check-merge-or-workflow-dispatch.outputs.deploy == 'true'
39-
40-
# permissions:
41-
# id-token: write
42-
# contents: read
43-
44-
# strategy:
45-
# max-parallel: 1
46-
# matrix:
47-
# component: [acct, app]
48-
49-
# steps:
50-
# - name: Checkout repository
51-
# uses: actions/checkout@v4
52-
53-
# - name: Updating Main Environment
54-
# env:
55-
# PR_TRIGGER_PAT: ${{ secrets.PR_TRIGGER_PAT }}
56-
# run: |
57-
# bash .github/scripts/dispatch_internal_repo_workflow.sh \
58-
# --releaseVersion "main" \
59-
# --targetWorkflow "dispatch-deploy-static-notify-web-template-management-env.yaml" \
60-
# --targetEnvironment "main" \
61-
# --targetAccountGroup "nhs-notify-template-management-dev" \
62-
# --targetComponent "${{ matrix.component }}" \
63-
# --terraformAction "apply"
34+
deploy-main:
35+
needs: check-merge-or-workflow-dispatch
36+
name: Deploy changes to main in dev AWS account
37+
runs-on: ubuntu-latest
38+
if: needs.check-merge-or-workflow-dispatch.outputs.deploy == 'true'
39+
40+
permissions:
41+
id-token: write
42+
contents: read
43+
44+
strategy:
45+
max-parallel: 1
46+
matrix:
47+
component: [acct, app]
48+
49+
steps:
50+
- name: Checkout repository
51+
uses: actions/checkout@v4
52+
53+
- name: Updating Main Environment
54+
env:
55+
PR_TRIGGER_PAT: ${{ secrets.PR_TRIGGER_PAT }}
56+
run: |
57+
bash .github/scripts/dispatch_internal_repo_workflow.sh \
58+
--releaseVersion "main" \
59+
--targetWorkflow "dispatch-deploy-static-notify-web-template-management-env.yaml" \
60+
--targetEnvironment "main" \
61+
--targetAccountGroup "nhs-notify-template-management-dev" \
62+
--targetComponent "${{ matrix.component }}" \
63+
--terraformAction "apply"
6464
6565
check-event-schemas-version-change:
6666
name: Check for event schemas package version change
@@ -117,33 +117,33 @@ jobs:
117117
- name: "Run provider contract tests"
118118
run: make test-contract-producer
119119

120-
# publish-event-schemas:
121-
# name: Publish event schemas package to GitHub package registry
122-
# needs:
123-
# - check-event-schemas-version-change
124-
# - test-contract-provider
125-
# if: needs.check-event-schemas-version-change.outputs.version_changed == 'true'
126-
# runs-on: ubuntu-latest
127-
# permissions:
128-
# contents: read
129-
# packages: write
130-
131-
# steps:
132-
# - name: Checkout code
133-
# uses: actions/[email protected]
134-
135-
# - name: Use Node.js 20
136-
# uses: actions/setup-node@v4
137-
# with:
138-
# node-version: '20.18.2'
139-
# registry-url: 'https://npm.pkg.github.com'
140-
141-
# - name: Install dependencies
142-
# run: make dependencies
143-
# env:
144-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
145-
146-
# - name: Publish to GitHub Packages
147-
# run: npm publish --workspace packages/event-schemas
148-
# env:
149-
# NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
120+
publish-event-schemas:
121+
name: Publish event schemas package to GitHub package registry
122+
needs:
123+
- check-event-schemas-version-change
124+
- test-contract-provider
125+
if: needs.check-event-schemas-version-change.outputs.version_changed == 'true'
126+
runs-on: ubuntu-latest
127+
permissions:
128+
contents: read
129+
packages: write
130+
131+
steps:
132+
- name: Checkout code
133+
uses: actions/[email protected]
134+
135+
- name: Use Node.js 20
136+
uses: actions/setup-node@v4
137+
with:
138+
node-version: '20.18.2'
139+
registry-url: 'https://npm.pkg.github.com'
140+
141+
- name: Install dependencies
142+
run: make dependencies
143+
env:
144+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
145+
146+
- name: Publish to GitHub Packages
147+
run: npm publish --workspace packages/event-schemas
148+
env:
149+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎packages/event-schemas/examples/TemplateDrafted/v1/email.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"clientId": "00f3b388-bbe9-41c9-9e76-052d37ee8988",
44
"createdAt": "2025-07-29T08:45:00.000Z",
55
"createdBy": "f5f76264-9764-4881-a54b-9bed6698150f",
6-
"foo": "bar",
76
"id": "871b0f4e-0b32-474e-a49a-23fc554bc5a6",
87
"message": "# Your GP Appointment\n\nDear ((firstName))\n\nYour appointment to visit the doctor is at ((appointmentTime)) on ((appointmentDate)).\n\nIf you are unable to make your appointment, please click [this link](https://example.com) to cancel.\n\nThank you\n\n((surgeryName))\n",
98
"name": "Example Email Template",

‎packages/event-schemas/examples/TemplateDrafted/v1/letter.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"createdAt": "2025-07-29T10:11:13.881Z",
55
"createdBy": "fd70f0ac-4eb3-4159-bcfa-60a325cc1bf2",
66
"files": {},
7-
"foo": "bar",
87
"id": "91be480d-c667-4741-957a-057b64753762",
98
"language": "en",
109
"letterType": "x0",

‎packages/event-schemas/examples/TemplateDrafted/v1/nhsapp.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"clientId": "d9159bb1-ac8c-467b-a990-b4e559ecdad3",
44
"createdAt": "2025-07-29T10:04:32.738Z",
55
"createdBy": "f2590ba5-6856-4207-b2dd-cd43821adf8b",
6-
"foo": "bar",
76
"id": "3a58a370-75ab-4788-a75e-cd2572a68523",
87
"message": "# Your GP Appointment\n\nDear ((firstName))\n\nYour appointment to visit the doctor is at **((appointmentTime))** on **((appointmentDate))**.\n\nIf you are unable to make your appointment, please click [this link](https://example.com) to cancel.\n\nThank you\n\n((surgeryName))\n",
98
"name": "Example NHS App Template",

‎packages/event-schemas/examples/TemplateDrafted/v1/sms.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"clientId": "2faa156e-3d87-4e80-a022-31536b79daf4",
44
"createdAt": "2025-07-29T09:45:42.472Z",
55
"createdBy": "9228217c-b0d9-4368-81ec-64e0127d16f0",
6-
"foo": "bar",
76
"id": "9779f827-0670-48b4-8e96-5cecf893468e",
87
"message": "Dear ((firstName))\n\nYour appointment to visit the doctor is at ((appointmentTime)) on ((appointmentDate)).\n\nIf you are unable to make your appointment, please click this link to cancel - https://example.com\n\nThank you\n\n((surgeryName))\n",
98
"name": "Example SMS Template",

‎packages/event-schemas/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@
5656
},
5757
"type": "commonjs",
5858
"types": "./dist/index.d.ts",
59-
"version": "1.0.1"
59+
"version": "1.0.0"
6060
}

‎packages/event-schemas/schemas/TemplateDrafted/v1.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,14 +371,10 @@
371371
"VIRUS_SCAN_FAILED",
372372
"WAITING_FOR_PROOF"
373373
]
374-
},
375-
"foo": {
376-
"type": "string"
377374
}
378375
},
379376
"required": [
380-
"templateStatus",
381-
"foo"
377+
"templateStatus"
382378
]
383379
}
384380
]

‎packages/event-schemas/src/events/template-drafted.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const $TemplateDraftedEventV1Data = z.intersection(
66
$TemplateEventV1Data,
77
z.object({
88
templateStatus: $TemplateStatus.exclude(['SUBMITTED', 'DELETED']),
9-
foo: z.string(),
109
})
1110
);
1211

0 commit comments

Comments
 (0)