Skip to content

chore: merge-down main into dev#231

Merged
Roopan-Microsoft merged 7 commits into
devfrom
psl-main-mergedown-dev
May 8, 2026
Merged

chore: merge-down main into dev#231
Roopan-Microsoft merged 7 commits into
devfrom
psl-main-mergedown-dev

Conversation

@Shreyas-Microsoft

Copy link
Copy Markdown
Contributor

Routine merge-down of main into dev.

Brings 6 commits from main (4 unique by content, 2 are merge commits) back into dev so the two long-lived branches don't drift further apart.

Commits picked up

SHA Subject
7474d9f docs: add Bicep CLI prerequisite to local deployment guide
76fb954 fix(ci): disable buildx provenance to fix ACR Standard push (400)
3552f12 Merge PR #221 (psl-addBicepVer)
0e9975 Merge PR #206 (hotfix/disable-buildx-provenance-acr-standard)

Files changed (vs dev)

.github/workflows/docker-build-and-push.yml | 3 +++ .github/workflows/job-docker-build.yml | 3 +++ docs/DeploymentGuide.md | 1 + 3 files changed, 7 insertions(+)

Notes

  • Clean merge — no conflicts, ort strategy.
  • No code changes outside CI workflows + docs.
  • Merge commit only; no rebase, no squash, no force-push.

Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com

Roopan-Microsoft and others added 7 commits April 24, 2026 11:46
feat: Dev merge to Main and introducing V2
ACR Standard SKU does not support OCI image indexes containing buildx
attestation manifests, causing docker/build-push-action to fail with
'400 Bad Request' on the manifest HEAD/PUT step.

Set provenance: false on all docker/build-push-action@v6 steps in:
  - .github/workflows/docker-build-and-push.yml
  - .github/workflows/job-docker-build.yml

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ce-acr-standard

fix(ci): disable buildx provenance to fix ACR Standard push (400)
Adds Bicep CLI (v0.33.0+) to the local deployment prerequisites so users provisioning this accelerator locally have the required Bicep version installed before running 'azd up' / 'az deployment'.

Work item: AB#42634
chore: Dev merge to main
docs: Add Bicep CLI (v0.33.0+) to local deployment prerequisites
Brings the following hotfix/doc commits from main back into dev:
  3552f12 Merge PR #221 (psl-addBicepVer)
  7474d9f docs: add Bicep CLI prerequisite to local deployment guide
  f0e9975 Merge PR #206 (hotfix/disable-buildx-provenance-acr-standard)
  76fb954 fix(ci): disable buildx provenance to fix ACR Standard push (400)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Routine merge-down from main into dev to keep long-lived branches aligned, carrying forward recent CI workflow adjustments and a documentation prerequisite update.

Changes:

  • Document Bicep CLI (v0.33.0+) as a local deployment prerequisite.
  • Disable Docker Buildx provenance in GitHub Actions docker build/push steps to avoid ACR Standard push failures.
  • Apply the provenance setting consistently across the reusable job workflow and the main build-and-push workflow.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File Description
docs/DeploymentGuide.md Adds Bicep CLI to local environment prerequisites.
.github/workflows/job-docker-build.yml Disables buildx provenance for all image build/push steps in the reusable workflow.
.github/workflows/docker-build-and-push.yml Disables buildx provenance for all image build/push steps in the main workflow.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .github/workflows/docker-build-and-push.yml
Comment thread .github/workflows/docker-build-and-push.yml
Comment thread .github/workflows/docker-build-and-push.yml
@Roopan-Microsoft Roopan-Microsoft merged commit 2ac4a94 into dev May 8, 2026
15 checks passed
@Roopan-Microsoft Roopan-Microsoft deleted the psl-main-mergedown-dev branch May 8, 2026 06:02
@github-actions

Copy link
Copy Markdown

🎉 This PR is included in version 2.0.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants