fix: Merging dev changes to main branch #289

Roopan-Microsoft · 2025-03-19T14:54:15Z

Purpose

This pull request introduces several important updates across various configuration files, aiming to enhance the deployment and development processes. The changes include new pipeline configurations, updates to dev container settings, and improvements to documentation for better clarity and usability.

Pipeline and Deployment Enhancements:

Added a new Azure DevOps pipeline configuration in .azdo/pipelines/azure-dev.yml to automate the deployment process using Azure CLI and AZD.
Introduced a GitHub Actions workflow in .github/workflows/azure-dev.yml for Azure template validation on pushes to the dev branch.
Updated the Docker build and push workflow in .github/workflows/docker-build-and-push.yml to support multiple branches and registries, including dependabotchanges. [1] [2] [3]

Development Environment Improvements:

Modified .devcontainer/devcontainer.json to use a newer Python image (3.11-bullseye), add port forwarding, and reduce memory requirements.

Documentation Updates:

Enhanced the README.md with quick deploy options and detailed deployment instructions for GitHub Codespaces, VS Code Dev Containers, and local environments. [1] [2] [3]
Removed outdated deployment instructions from README_azd.md to streamline the documentation.

Configuration and Ownership:

Updated the .env.sample file to include a new environment variable AZURE_OPENAI_API_VERSION.
Added a new code owner @blessing-sanusi in .github/CODEOWNERS.

These changes collectively aim to improve the automation, deployment, and development experience for the project.

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

I have built and tested the code locally and in a deployed app
For frontend changes, I have pulled the latest code from main, built the frontend, and committed all static files.
This is a change for all users of this app. No code or asset is specific to my use case or my organization.

Other Information

Bumps [pydantic-settings](https://github.com/pydantic/pydantic-settings) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/pydantic/pydantic-settings/releases) - [Commits](pydantic/pydantic-settings@v2.7.0...v2.7.1) --- updated-dependencies: - dependency-name: pydantic-settings dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [eslint-plugin-n](https://github.com/eslint-community/eslint-plugin-n) from 16.6.2 to 17.15.1. - [Release notes](https://github.com/eslint-community/eslint-plugin-n/releases) - [Changelog](https://github.com/eslint-community/eslint-plugin-n/blob/master/CHANGELOG.md) - [Commits](eslint-community/eslint-plugin-n@16.6.2...v17.15.1) --- updated-dependencies: - dependency-name: eslint-plugin-n dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [@fluentui/react](https://github.com/microsoft/fluentui) from 8.122.3 to 8.122.4. - [Release notes](https://github.com/microsoft/fluentui/releases) - [Changelog](https://github.com/microsoft/fluentui/blob/master/azure-pipelines.release.yml) - [Commits](https://github.com/microsoft/fluentui/compare/@fluentui/react_v8.122.3...@fluentui/react_v8.122.4) --- updated-dependencies: - dependency-name: "@fluentui/react" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…nd/dependabotchanges/fluentui/react-8.122.4 build: bump @fluentui/react from 8.122.3 to 8.122.4 in /frontend

Bumps [pytest-asyncio](https://github.com/pytest-dev/pytest-asyncio) from 0.25.0 to 0.25.3. - [Release notes](https://github.com/pytest-dev/pytest-asyncio/releases) - [Commits](pytest-dev/pytest-asyncio@v0.25.0...v0.25.3) --- updated-dependencies: - dependency-name: pytest-asyncio dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [azure-storage-blob](https://github.com/Azure/azure-sdk-for-python) from 12.24.0 to 12.24.1. - [Release notes](https://github.com/Azure/azure-sdk-for-python/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md) - [Commits](Azure/azure-sdk-for-python@azure-storage-blob_12.24.0...azure-storage-blob_12.24.1) --- updated-dependencies: - dependency-name: azure-storage-blob dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [isort](https://github.com/pycqa/isort) from 5.13.2 to 6.0.0. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](PyCQA/isort@5.13.2...6.0.0) --- updated-dependencies: - dependency-name: isort dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) and [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom). These dependencies needed to be updated together. Updates `react-dom` from 18.3.1 to 19.0.0 - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v19.0.0/packages/react-dom) Updates `@types/react-dom` from 18.3.5 to 19.0.3 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom) --- updated-dependencies: - dependency-name: react-dom dependency-type: direct:production update-type: version-update:semver-major - dependency-name: "@types/react-dom" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [@fluentui/react](https://github.com/microsoft/fluentui) from 8.122.4 to 8.122.9. - [Release notes](https://github.com/microsoft/fluentui/releases) - [Changelog](https://github.com/microsoft/fluentui/blob/master/azure-pipelines.release.yml) - [Commits](https://github.com/microsoft/fluentui/compare/@fluentui/react_v8.122.4...@fluentui/react_v8.122.9) --- updated-dependencies: - dependency-name: "@fluentui/react" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.5 to 6.1.0. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/[email protected]/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…es/pydantic-settings-2.7.1 build: bump pydantic-settings from 2.7.0 to 2.7.1

…nd/dependabotchanges/eslint-plugin-n-17.15.1 build: bump eslint-plugin-n from 16.6.2 to 17.15.1 in /frontend

…es/pytest-asyncio-0.25.3 build: bump pytest-asyncio from 0.25.0 to 0.25.3

Bumps [black](https://github.com/psf/black) from 24.10.0 to 25.1.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@24.10.0...25.1.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…es/black-25.1.0 build: bump black from 24.10.0 to 25.1.0

…es/azure-storage-blob-12.24.1 build: bump azure-storage-blob from 12.24.0 to 12.24.1

…es/isort-6.0.0 build: bump isort from 5.13.2 to 6.0.0

Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.37.3 to 7.37.4. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](jsx-eslint/eslint-plugin-react@v7.37.3...v7.37.4) --- updated-dependencies: - dependency-name: eslint-plugin-react dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…nd/dependabotchanges/multi-422f831423 build: bump react-dom and @types/react-dom in /frontend

Bumps [pymupdf](https://github.com/pymupdf/pymupdf) from 1.25.1 to 1.25.3. - [Release notes](https://github.com/pymupdf/pymupdf/releases) - [Changelog](https://github.com/pymupdf/PyMuPDF/blob/main/changes.txt) - [Commits](pymupdf/PyMuPDF@1.25.1...1.25.3) --- updated-dependencies: - dependency-name: pymupdf dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [langchain](https://github.com/langchain-ai/langchain) from 0.3.13 to 0.3.19. - [Release notes](https://github.com/langchain-ai/langchain/releases) - [Commits](langchain-ai/langchain@langchain==0.3.13...langchain==0.3.19) --- updated-dependencies: - dependency-name: langchain dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…nd/dependabotchanges/eslint-plugin-react-7.37.4 build: bump eslint-plugin-react from 7.37.3 to 7.37.4 in /frontend

Bumps [azure-search-documents](https://github.com/Azure/azure-sdk-for-python) from 11.6.0b8 to 11.6.0b9. - [Release notes](https://github.com/Azure/azure-sdk-for-python/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/search/azure-search-documents/CHANGELOG.md) - [Commits](Azure/azure-sdk-for-python@azure-search-documents_11.6.0b8...azure-search-documents_11.6.0b9) --- updated-dependencies: - dependency-name: azure-search-documents dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…nd/dependabotchanges/fluentui/react-8.122.9 build: bump @fluentui/react from 8.122.4 to 8.122.9 in /frontend

Bumps [docx](https://github.com/dolanmiu/docx) from 8.5.0 to 9.2.0. - [Release notes](https://github.com/dolanmiu/docx/releases) - [Commits](dolanmiu/docx@8.5.0...9.2.0) --- updated-dependencies: - dependency-name: docx dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…es/azure-search-documents-11.6.0b9 build: bump azure-search-documents from 11.6.0b8 to 11.6.0b9

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.10.3 to 22.13.4. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

…nd/dependabotchanges/types/node-22.13.4 build: bump @types/node from 22.10.3 to 22.13.4 in /frontend

azd pipeline changes

Azd pipeline

search env added

azd pipeline

fix: update deployment

…l for testing

…how content instead of full content as full content is no longer used in index

fix: added app service env variable values and made "sourceurl" index field as searchable to show citations

docs: update readme

…ic-Build-your-own-copilot-Solution-Accelerator into fetch-history-US

fix: fetch history on button click and not on web page load

dependabot bot and others added 30 commits January 2, 2025 03:59

Merge pull request #192 from microsoft/dependabot/npm_and_yarn/fronte…

3c4f715

…nd/dependabotchanges/fluentui/react-8.122.4 build: bump @fluentui/react from 8.122.3 to 8.122.4 in /frontend

updated user prompt

446b92d

UI - SectionCard API failing issue (re triggering API when it is fails)

471d51c

Merge pull request #177 from microsoft/dependabot/pip/dependabotchang…

3ffff6c

…es/pydantic-settings-2.7.1 build: bump pydantic-settings from 2.7.0 to 2.7.1

Merge pull request #180 from microsoft/dependabot/npm_and_yarn/fronte…

64b17c4

…nd/dependabotchanges/eslint-plugin-n-17.15.1 build: bump eslint-plugin-n from 16.6.2 to 17.15.1 in /frontend

Merge pull request #198 from microsoft/dependabot/pip/dependabotchang…

64351d9

…es/pytest-asyncio-0.25.3 build: bump pytest-asyncio from 0.25.0 to 0.25.3

Merge pull request #200 from microsoft/dependabot/pip/dependabotchang…

fa79e3b

…es/black-25.1.0 build: bump black from 24.10.0 to 25.1.0

Merge pull request #201 from microsoft/dependabot/pip/dependabotchang…

d5eafc1

…es/azure-storage-blob-12.24.1 build: bump azure-storage-blob from 12.24.0 to 12.24.1

Merge pull request #204 from microsoft/dependabot/pip/dependabotchang…

f7882db

…es/isort-6.0.0 build: bump isort from 5.13.2 to 6.0.0

Merge pull request #206 from microsoft/dependabot/npm_and_yarn/fronte…

53f6615

…nd/dependabotchanges/multi-422f831423 build: bump react-dom and @types/react-dom in /frontend

Merge pull request #209 from microsoft/dependabot/npm_and_yarn/fronte…

df2d506

…nd/dependabotchanges/eslint-plugin-react-7.37.4 build: bump eslint-plugin-react from 7.37.3 to 7.37.4 in /frontend

Merge pull request #211 from microsoft/dependabot/npm_and_yarn/fronte…

68101d2

…nd/dependabotchanges/fluentui/react-8.122.9 build: bump @fluentui/react from 8.122.4 to 8.122.9 in /frontend

Merge pull request #205 from microsoft/dependabot/pip/dependabotchang…

bfff91d

…es/azure-search-documents-11.6.0b9 build: bump azure-search-documents from 11.6.0b8 to 11.6.0b9

Merge pull request #228 from microsoft/dependabot/npm_and_yarn/fronte…

ecb8f9a

…nd/dependabotchanges/types/node-22.13.4 build: bump @types/node from 22.10.3 to 22.13.4 in /frontend

blessing-sanusi and others added 17 commits March 18, 2025 10:24

Merge branch 'dev' into az-search-params

692f0ea

Merge pull request #283 from microsoft/az-search-params

1709bdb

azd pipeline changes

azd pipeline changes

06f2d24

azd pipeline changes

8531240

Merge pull request #284 from microsoft/azd-pipeline

ecf9624

Azd pipeline

search env added

6deedf0

Merge pull request #285 from microsoft/azd-pipeline

76b9729

search env added

azd pipeline

1067cf9

Merge pull request #286 from microsoft/azd-pipeline

ffbcc0d

azd pipeline

fix: update deployment

942ec91

Merge pull request #287 from microsoft/biceptemplate

bd88252

fix: update deployment

added env variables values in app servies bicep

32d30e4

updated search filter field name

7f89715

making sourceurl field in search index searchable and changing baseur…

c6ce3b0

…l for testing

making sourceurl field searchable in index

4433d59

reverted the baseurl to point to dev branch and changed document to s…

8d7924a

…how content instead of full content as full content is no longer used in index

Merge pull request #288 from microsoft/add-appser-envvar-values

31a4dec

fix: added app service env variable values and made "sourceurl" index field as searchable to show citations

Roopan-Microsoft requested review from Avijit-Microsoft, Prajwal-Microsoft, Vinay-Microsoft, hunterjam, malrose07 and toherman-msft as code owners March 19, 2025 14:54

Harsh-Microsoft and others added 6 commits March 19, 2025 20:45

removed "cd Backend" from start.cmd

739dcf5

docs: update readme

9b4699b

Merge pull request #290 from microsoft/readmeupdates

a994fe3

docs: update readme

handle history item list call once clicked

c6ab9d9

Merge branch 'fetch-history-US' of https://github.com/microsoft/Gener…

a5d30cb

…ic-Build-your-own-copilot-Solution-Accelerator into fetch-history-US

Merge pull request #282 from microsoft/fetch-history-US

c3e807e

fix: fetch history on button click and not on web page load

Roopan-Microsoft closed this Mar 19, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Merging dev changes to main branch #289

fix: Merging dev changes to main branch #289

Uh oh!

Roopan-Microsoft commented Mar 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

fix: Merging dev changes to main branch #289

fix: Merging dev changes to main branch #289

Uh oh!

Conversation

Roopan-Microsoft commented Mar 19, 2025

Purpose

Pipeline and Deployment Enhancements:

Development Environment Improvements:

Documentation Updates:

Configuration and Ownership:

Does this introduce a breaking change?

Golden Path Validation

Deployment Validation

What to Check

Other Information

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants