Skip to content

Subtask/fct2 22185 automatically tag merge commits to main - #602

Closed
lilachdavis wants to merge 7 commits into
mainfrom
subtask/FCT2-22185_Automatically-tag-merge-commits-to-main
Closed

Subtask/fct2 22185 automatically tag merge commits to main#602
lilachdavis wants to merge 7 commits into
mainfrom
subtask/FCT2-22185_Automatically-tag-merge-commits-to-main

Conversation

@lilachdavis

@lilachdavis lilachdavis commented Sep 29, 2026

Copy link
Copy Markdown
Contributor

PR checklist

Tick what applies before you raise. Delete anything that doesn't.

Correctness

  • Does what the ticket asks for
  • Handles the edge cases (empty, null, zero, large inputs), not just the happy path
  • Errors are handled, not swallowed
  • New logic has tests, including the failure cases
  • Tests assert something real, not just run the code

Keeping it simple

  • Doesn't rebuild something that already exists in the codebase
  • No more complex or slower than it needs to be
  • No leftover debug logging or commented-out code

Code Quality

  • Pre-commit hooks were run for all commits in this PR

Easy to miss (a green pipeline won't flag these)

  • One logical change, not a pile of unrelated stuff

If you touched the backend

  • Schema changes have a migration, and the Down() doesn't drop anything it shouldn't
  • New app settings are wired into the fa-config templates
  • Secrets use Key Vault references, not plain text
  • New outbound HTTP clients go through the shared resilience handler (AddResiliencePolicyHandler), rather than hand-rolling retries
  • New calls to an external service (DDEI, Egress, NetApp) have client tests against a WireMock stub (for the serialisation, auth and error handling) and are covered by the integration tests that run against the real dev services

If you touched the UI

  • Ran the e2e/ suite locally (the PR build only runs the mocked tests; the full suite runs post-merge and gates the deploy)
  • API changes are reflected in the MSW handlers in src/mocks and the matching zod schema, so the mocked tests aren't passing against a contract that's gone
  • New config or feature flags are wired into the VITE build variables, not just added in code
  • Data fetches handle the loading, empty and error states, not just success, and match how the rest of the app already does it
  • Ran prettier (npm run prettier:format), since CI lints but doesn't check formatting
  • Checked accessibility (keyboard nav, screen reader, sensible labels), since the Lighthouse run is manual and won't flag it for you

lilachdavis and others added 7 commits September 23, 2026 14:48
@lilachdavis @bridgesr @renjithabby
Task/fct2 22065 revise cicd for new branching strategy (#583)
20d6cd7 
* filtering status telemetry (#581)

* filtering status telemetry

* fix nuget

* pr comment fixes

* add version to dotnet build

* deploy envs conditionally, require manualvalidation only for prod

* story/FCT2-20672 : Text content update for the unauthorised page (#584)

* add separate pipeline yaml for development trigger

* unblock E2E Tests in Dev

* test release versioning in dev

* test release versioning in dev

* use var instead of parameter for buildConfiguration

* remove temorary test lines

* task/FCT2-21994 backend test pipeline - rm redundant build job (#585)

* egress delete check all files successful (#586)

* Fct2 21924 bulk delete unknown files (#587)

* deletion of unexisting files

* deletion of existing files

* update parameter empty string value option

* trigger integration tests only for debelopment

* rm unused parameters, fix stage dependency

* fix stage dependency

---------

Co-authored-by: Rhys Bridges <rhys.bridges@cps.gov.uk>
Co-authored-by: Renjith Abby <renjithabby@gmail.com>
@HasanCPS @bridgesr
@renjithabby @lilachdavis
Back merge main into development (#592)
f86801e 
* filtering status telemetry (#581)

* filtering status telemetry

* fix nuget

* pr comment fixes

* story/FCT2-20672 : Text content update for the unauthorised page (#584)

* task/FCT2-21994 backend test pipeline - rm redundant build job (#585)

* egress delete check all files successful (#586)

* Fct2 21924 bulk delete unknown files (#587)

* deletion of unexisting files

* deletion of existing files

---------

Co-authored-by: Rhys Bridges <rhys.bridges@cps.gov.uk>
Co-authored-by: Renjith Abby <renjithabby@gmail.com>
Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>
@HasanCPS
Merge origin/main into development
a292ed8
@HasanCPS
Merge origin/main into development
6d96f96
@lilachdavis
subtask/FCT2-22142 Add separate test flow for PRs from development in…
97756fb 
…to main (#594)

- Introduce prSourceBranch and prTargetBranch variables to conditionally run pipeline stages.
- When a PR is opened from development into main:
  - Unit and integration tests are skipped.
  - If there are any changed files within the ui-spa directory, the playwright E2E tests will run against the DEV environment
- When a PR is opened against development OR against main from any source other than development, only the relevant unit and integration tests will run.
@lilachdavis
Validate releaseVersion avar on PR and tag repo on merge to main
6c50144
@lilachdavis
handle case where no remote tags exist
b336821
@sonarqubecloud

sonarqubecloud Bot commented Sep 29, 2026 •
edited
Loading

Copy link
Copy Markdown

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues
0 New dependency risks

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lilachdavis @HasanCPS