Skip to content

Sync develop to main - #403

Merged
ptr727 merged 3 commits into
mainfrom
develop
Jun 3, 2026
Merged

Sync develop to main#403
ptr727 merged 3 commits into
mainfrom
develop

Conversation

@ptr727

@ptr727 ptr727 commented Jun 3, 2026

Copy link
Copy Markdown
Owner

Promotes develop to main.

Included

  • Smoke-test the PR base branch; move VS Code recs to the workspace (Smoke-test the PR base branch; move VS Code recs to the workspace #402) — the PR smoke build now targets the PR base branch (github.base_ref) so a PR onto develop builds the develop rows and a PR onto main builds the main rows (2 builds, correct branch). Also removes the redundant .vscode/extensions.json (recommendations live in NxWitness.code-workspace) and documents the workspace convention.

Notes

  • Merge with a merge commit (not squash), per the main ruleset, to keep develop forward-only.
  • This promotion contains no image-file changes, so its own smoke build will be skipped. Base-branch smoke behavior is validated separately via throwaway test PRs.

🤖 Generated with Claude Code

Smoke build now targets the PR base branch via a smoke_branch input wired to github.base_ref (PR onto develop validates develop rows, PR onto main validates main rows; 2 builds, correct branch). Also removes the redundant .vscode/extensions.json in favor of the existing NxWitness.code-workspace recommendations, and documents the workspace convention.
Copilot AI review requested due to automatic review settings June 3, 2026 17:51

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Promotes develop to main, bringing along the CI/doc updates from the referenced work to (a) make the PR smoke build target the PR’s base branch rows and (b) consolidate VS Code extension recommendations into the repository workspace file.

Changes:

  • Update the PR smoke build to filter NxMeta/NxMeta-LSIO rows by PR base branch via a new smoke_branch input.
  • Remove .vscode/extensions.json and document the “workspace file is the source of VS Code recommendations/settings” convention.
  • Refresh guidance docs (AGENTS + Copilot instructions) to reflect the workspace/linting workflow.

Reviewed changes

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

Show a summary per file
File Description
AGENTS.md Updates workspace/linting guidance and links to reflect recommendations living in NxWitness.code-workspace.
.vscode/extensions.json Removes the VS Code extension recommendations file (now intended to be redundant with the workspace).
.github/workflows/test-pull-request.yml Passes github.base_ref into the reusable build workflow to restrict smoke builds to the PR base branch rows.
.github/workflows/build-docker-task.yml Adds smoke_branch input and applies it in the jq matrix filter when in smoke mode.
.github/copilot-instructions.md Updates Copilot guidance to reference workspace-based linting/recommendations instead of .vscode/extensions.json.

Comment thread AGENTS.md Outdated
Comment thread .github/copilot-instructions.md Outdated
Scope the .vscode-vs-workspace statement to settings/extension recommendations/spell-check words (no longer contradicting tracked .vscode/tasks.json), and drop the 'every structured file type' overclaim in favor of the extensions' actual coverage.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

Updated
[dotnet-outdated-tool](https://github.com/dotnet-outdated/dotnet-outdated)
from 4.7.2 to 4.8.0.

<details>
<summary>Release notes</summary>

_Sourced from [dotnet-outdated-tool's
releases](https://github.com/dotnet-outdated/dotnet-outdated/releases)._

## 4.8.0



Commits viewable in [compare
view](dotnet-outdated/dotnet-outdated@v4.7.2...v4.8.0).
</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ptr727
ptr727 merged commit 96950b1 into main Jun 3, 2026
8 checks passed
This was referenced Aug 30, 2026
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.

2 participants