Skip to content

Commit 0dd70fa

Browse files
anthony-nhsanthony-nhs
authored
Chore: [AEA-0000] - tag release in jira using semantic-release (#2878)
## Summary - Routine Change ### Details - tag release in jira using semantic release - remove updating jira/confluence from here
1 parent 0fee58e commit 0dd70fa

10 files changed

Lines changed: 20 additions & 134 deletions

‎.github/scripts/call_mark_jira_released.sh‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.github/scripts/create_env_release_notes.sh‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/scripts/create_int_rc_release_notes.sh‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/scripts/get_current_dev_tag.sh‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.github/scripts/get_target_deployed_tag.sh‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ jobs:
3333
3434
tag_release:
3535
needs: [quality_checks, get_commit_id, get_config_values]
36-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
36+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@7a89b111ae752548e8e3f3fbaeb89bd6ecca0698
37+
permissions:
38+
id-token: write
39+
contents: write
3740
with:
3841
dry_run: true
3942
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -62,8 +65,6 @@ jobs:
6265
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
6366
COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
6467
LOG_RETENTION_DAYS: 30
65-
CREATE_INT_RELEASE_NOTES: true
66-
CREATE_PROD_RELEASE_NOTES: true
6768
DEPLOY_APIGEE: true
6869
DYNAMODB_AUTOSCALE: false
6970
DEPLOY_APIGEE_CPSU: true

‎.github/workflows/pull_request.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ jobs:
6060

6161
tag_release:
6262
needs: [get_config_values]
63-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
63+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@7a89b111ae752548e8e3f3fbaeb89bd6ecca0698
64+
permissions:
65+
id-token: write
66+
contents: write
6467
with:
6568
dry_run: true
6669
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,20 @@ jobs:
3131
3232
tag_release:
3333
needs: [quality_checks, get_commit_id, get_config_values]
34-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
34+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@7a89b111ae752548e8e3f3fbaeb89bd6ecca0698
35+
permissions:
36+
id-token: write
37+
contents: write
3538
with:
3639
dry_run: false
3740
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
3841
branch_name: main
3942
tag_format: ${{ needs.get_config_values.outputs.tag_format }}
40-
secrets: inherit
43+
update_jira: true
44+
jira_release_prefix: "psu"
45+
secrets:
46+
EXECUTE_JIRA_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
47+
4148

4249
package_code:
4350
needs: [tag_release, get_config_values]
@@ -61,8 +68,6 @@ jobs:
6168
COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
6269
LOG_LEVEL: DEBUG
6370
LOG_RETENTION_DAYS: 30
64-
CREATE_INT_RELEASE_NOTES: true
65-
CREATE_PROD_RELEASE_NOTES: true
6671
DEPLOY_APIGEE: true
6772
DYNAMODB_AUTOSCALE: false
6873
DEPLOY_APIGEE_CPSU: true
@@ -254,8 +259,6 @@ jobs:
254259
COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
255260
LOG_LEVEL: DEBUG
256261
LOG_RETENTION_DAYS: 30
257-
CREATE_INT_RELEASE_NOTES: true
258-
CREATE_INT_RC_RELEASE_NOTES: true
259262
DEPLOY_APIGEE: true
260263
DYNAMODB_AUTOSCALE: false
261264
DEPLOY_APIGEE_CPSU: true
@@ -352,8 +355,6 @@ jobs:
352355
COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
353356
LOG_LEVEL: INFO
354357
LOG_RETENTION_DAYS: 731
355-
MARK_JIRA_RELEASED: true
356-
CREATE_PROD_RELEASE_NOTES: true
357358
DEPLOY_APIGEE: true
358359
DYNAMODB_AUTOSCALE: true
359360
DEPLOY_APIGEE_CPSU: true

‎.github/workflows/run_release_code_and_api.yml‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,6 @@ on:
3737
LOG_RETENTION_DAYS:
3838
required: true
3939
type: string
40-
CREATE_INT_RELEASE_NOTES:
41-
type: boolean
42-
default: false
43-
CREATE_INT_RC_RELEASE_NOTES:
44-
type: boolean
45-
default: false
46-
CREATE_PROD_RELEASE_NOTES:
47-
type: boolean
48-
default: false
49-
MARK_JIRA_RELEASED:
50-
type: boolean
51-
default: false
5240
DEPLOY_APIGEE:
5341
type: boolean
5442
default: true
@@ -169,18 +157,6 @@ jobs:
169157
sparse-checkout: |
170158
.github
171159
172-
- name: create_int_rc_release_notes
173-
uses: ./.github/actions/update_confluence_jira
174-
if: ${{ inputs.CREATE_INT_RC_RELEASE_NOTES == true }}
175-
with:
176-
TARGET_ENVIRONMENT: int
177-
RELEASE_TAG: ${{ inputs.VERSION_NUMBER }}
178-
CONFLUENCE_PAGE_ID: "789747650"
179-
CREATE_RC_RELEASE_NOTES: true
180-
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
181-
TARGET_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
182-
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
183-
184160
- name: Configure AWS Credentials
185161
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
186162
with:
@@ -304,36 +280,6 @@ jobs:
304280
MTLS_KEY: ${{ inputs.MTLS_KEY }}
305281
ENABLE_MUTUAL_TLS: ${{ inputs.ENABLE_MUTUAL_TLS }}
306282
run: ./deploy_api.sh
307-
308-
- name: create_int_release_notes
309-
uses: ./.github/actions/update_confluence_jira
310-
if: ${{ inputs.CREATE_INT_RELEASE_NOTES == true && always() && !failure() && !cancelled() }}
311-
with:
312-
TARGET_ENVIRONMENT: int
313-
CONFLUENCE_PAGE_ID: "789747642"
314-
CREATE_RC_RELEASE_NOTES: false
315-
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
316-
TARGET_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
317-
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
318-
319-
- name: create_prod_release_notes
320-
uses: ./.github/actions/update_confluence_jira
321-
if: ${{ inputs.CREATE_PROD_RELEASE_NOTES == true && always() && !failure() && !cancelled() }}
322-
with:
323-
TARGET_ENVIRONMENT: prod
324-
CONFLUENCE_PAGE_ID: "789747646"
325-
CREATE_RC_RELEASE_NOTES: false
326-
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
327-
TARGET_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
328-
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
329-
330-
- name: mark_released_in_jira
331-
uses: ./.github/actions/mark_jira_released
332-
if: ${{ inputs.MARK_JIRA_RELEASED == true && always() && !failure() && !cancelled() }}
333-
with:
334-
RELEASE_TAG: ${{ inputs.VERSION_NUMBER }}
335-
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
336-
337283
- name: Checkout gh-pages
338284
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
339285
with:

‎.trivyignore.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ vulnerabilities:
2323
- id: CVE-2026-2229
2424
statement: Transitive dependency vulnerability in undici of npm
2525
expired_at: 2026-06-01
26+
- id: CVE-2026-33036
27+
statement: fast-xml-parser - will be updated soon
28+
expired_at: 2026-06-01

0 commit comments

Comments
 (0)