Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions .github/workflows/cdk_release_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,6 @@ on:
COMMIT_ID:
required: true
type: string
CREATE_INT_RELEASE_NOTES:
type: boolean
default: false
CREATE_INT_RC_RELEASE_NOTES:
type: boolean
default: false
CREATE_PROD_RELEASE_NOTES:
type: boolean
default: false
MARK_JIRA_RELEASED:
type: boolean
default: false
pinned_image:
type: string
required: true
Expand Down Expand Up @@ -83,18 +71,6 @@ jobs:
mkdir -p .build
tar -xf artifact.tar

- name: create_int_rc_release_notes
uses: ./.github/actions/update_confluence_jira
if: ${{ inputs.CREATE_INT_RC_RELEASE_NOTES == true }}
with:
TARGET_ENVIRONMENT: int
RELEASE_TAG: ${{ inputs.VERSION_NUMBER }}
CONFLUENCE_PAGE_ID: "913232854"
CREATE_RC_RELEASE_NOTES: true
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
TARGET_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}

- name: Configure AWS Credentials
id: connect-aws
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
Expand All @@ -116,35 +92,6 @@ jobs:
CDK_CONFIG_isPullRequest: ${{ inputs.IS_PULL_REQUEST }}
CDK_CONFIG_environment: ${{ inputs.TARGET_ENVIRONMENT }}

- name: create_int_release_notes
uses: ./.github/actions/update_confluence_jira
if: ${{ inputs.CREATE_INT_RELEASE_NOTES == true && always() && !failure() && !cancelled() }}
with:
TARGET_ENVIRONMENT: int
CONFLUENCE_PAGE_ID: "913232855"
CREATE_RC_RELEASE_NOTES: false
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
TARGET_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}

- name: create_prod_release_notes
uses: ./.github/actions/update_confluence_jira
if: ${{ inputs.CREATE_PROD_RELEASE_NOTES == true && always() && !failure() && !cancelled() }}
with:
TARGET_ENVIRONMENT: prod
CONFLUENCE_PAGE_ID: "913232856"
CREATE_RC_RELEASE_NOTES: false
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
TARGET_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}

- name: mark_released_in_jira
uses: ./.github/actions/mark_jira_released
if: ${{ inputs.MARK_JIRA_RELEASED == true && always() && !failure() && !cancelled() }}
with:
RELEASE_TAG: ${{ inputs.VERSION_NUMBER }}
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}

- name: Checkout gh-pages
if: ${{ !startsWith(inputs.STACK_NAME, 'lambda-resources-pr-') }}
uses: actions/checkout@v6.0.2
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

tag_release:
needs: [quality_checks, get_commit_id, get_config_values]
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@update_jira
with:
dry_run: true
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
Expand All @@ -57,8 +57,6 @@ jobs:
BUILD_ARTIFACT: packaged_code
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
CREATE_INT_RELEASE_NOTES: true
CREATE_PROD_RELEASE_NOTES: true
IS_PULL_REQUEST: false
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
tag_release:
if: github.event_name != 'merge_group'
needs: [get_config_values]
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@update_jira
with:
dry_run: true
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ jobs:

tag_release:
needs: [quality_checks, get_commit_id, get_config_values]
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@update_jira
with:
dry_run: false
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
branch_name: main
tag_format: ${{ needs.get_config_values.outputs.tag_format }}
update_jira: true
jira_release_prefix: "aws-dashboards"
Comment on lines +34 to +41
secrets: inherit

package_code:
Expand All @@ -56,8 +58,6 @@ jobs:
BUILD_ARTIFACT: packaged_code
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
CREATE_INT_RELEASE_NOTES: true
CREATE_PROD_RELEASE_NOTES: true
IS_PULL_REQUEST: false
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
Expand Down Expand Up @@ -110,8 +110,6 @@ jobs:
BUILD_ARTIFACT: packaged_code
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
CREATE_INT_RELEASE_NOTES: true
CREATE_INT_RC_RELEASE_NOTES: true
IS_PULL_REQUEST: false
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.INT_CLOUD_FORMATION_DEPLOY_ROLE }}
Expand All @@ -132,8 +130,6 @@ jobs:
BUILD_ARTIFACT: packaged_code
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
MARK_JIRA_RELEASED: true
CREATE_PROD_RELEASE_NOTES: true
IS_PULL_REQUEST: false
secrets:
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_DEPLOY_ROLE }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ amplify_outputs.json
.asdf
cdk.out/
.npmrc
.trivy_out/
7 changes: 7 additions & 0 deletions .trivyignore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,10 @@ vulnerabilities:
- id: CVE-2026-27904
statement: minimatch vulnerability accepted as risk - dependency of various packages
expired_at: 2026-04-01
- id: CVE-2026-33036
statement: fast-xml-parser - dependency of @aws-sdk
expired_at: 2026-06-01
- id: CVE-2026-32141
statement: flatted vulnerability accepted
expired_at: 2026-06-01

Loading