Skip to content

feat: Merge cps-v2-dev in v1-DEV#480

Open
Shreyas-Microsoft wants to merge 24 commits intopsl-cps-v2from
psl-cps-v2-dev
Open

feat: Merge cps-v2-dev in v1-DEV#480
Shreyas-Microsoft wants to merge 24 commits intopsl-cps-v2from
psl-cps-v2-dev

Conversation

@Shreyas-Microsoft
Copy link
Copy Markdown
Collaborator

Purpose

This pull request introduces several improvements to the CI/CD pipeline and development environment, focusing on expanding Docker image build/push capabilities, updating workflow logic, and modernizing the dev container setup. The changes enhance automation, support for new branches, and toolchain consistency.

CI/CD Pipeline Enhancements:

  • Expanded Branch Support and Tagging

    • The Docker image build workflow (build-docker-image.yml) now supports the psl-docker-build-and-push-v2 and psl-cps-v2 branches for both push and pull request triggers. Images built from these branches are tagged as latest_v2 for consistency. [1] [2] [3] [4]
    • The workflow conditions for Azure login, ACR login, and image push now include these new branches, ensuring CI/CD runs as expected for feature development. [1] [2] [3] [4]
  • New Docker Image Build

    • Added a build-and-push step for the ContentProcessorWorkflow Docker image, aligning it with the other services.

Dev Container and Toolchain Updates:

  • Switch to pnpm and Corepack

    • The dev container now uses pnpm (enabled and prepared via Corepack) instead of yarn for installing dependencies in ContentProcessorWeb, promoting faster and more reliable installs. [1] [2]
    • Global NPM tools are updated, and yarn is no longer installed by default.
  • Python Symlink for Compatibility

    • A symlink from /usr/bin/python to /usr/bin/python3 is created to improve compatibility with tooling expecting python.
  • Cleanup and Permissions

    • The dev setup script no longer attempts to chmod register_schema.sh (which is now a Python script and cross-platform).

Workflow Logic and Permissions Adjustments:

  • Workflow File and Input Cleanup

    • The deploy workflow file is renamed from deploy-v2.yml to deploy-linux.yml, and the runner OS input logic is removed in favor of always using ubuntu-latest, simplifying the workflow and reducing unnecessary complexity. [1] [2] [3] [4] [5] [6] [7]
  • Permissions and Conditional Logic

    • Permissions are explicitly set in deploy-orchestrator.yml, and the cleanup step is now only triggered if the deployment succeeded, preventing resource cleanup in failed runs. [1] [2]

Does this introduce a breaking change?

  • Yes
  • No

Golden Path Validation

  • I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

Deployment Validation

  • I have validated the deployment process successfully and all services are running as expected with this change.

What to Check

Verify that the following are valid

  • ...

Other Information

Copilot AI and others added 24 commits March 3, 2026 17:04
…ckages

Co-authored-by: Ayaz-Microsoft <234034413+Ayaz-Microsoft@users.noreply.github.com>
…erabilities

fix: high severity Dependabot vulnerabilities in dev branch
fix: Dependabot vulnerabilities fix
perf: Refactor imports and clean up unused variables across multiple components
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
chore: Dev merging in Main
Added note for azd version 1.23.9 regarding preflight configuration.
docs: Update Deployment Guide with azd version note
fix: sync main with dev Update Deployment Guide with azd version 1.23.9 note
fix: update VM size defaults and enhance troubleshooting documentation for the same
fix: Fixed issues related to intermittent WAF deployment failures
fix: remove unused favicon and related references from configuration
fix: Updated azure.yaml file to exclude the 1.23.9 azd version
@Shreyas-Microsoft Shreyas-Microsoft changed the base branch from dev to psl-cps-v2 March 30, 2026 12:41
@Shreyas-Microsoft Shreyas-Microsoft marked this pull request as ready for review March 30, 2026 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants