Skip to content

Smoke-test the PR base branch; move VS Code recs to the workspace - #402

Merged
ptr727 merged 2 commits into
developfrom
smoke-target-base-branch
Jun 3, 2026
Merged

Smoke-test the PR base branch; move VS Code recs to the workspace#402
ptr727 merged 2 commits into
developfrom
smoke-target-base-branch

Conversation

@ptr727

@ptr727 ptr727 commented Jun 3, 2026

Copy link
Copy Markdown
Owner

Smoke build targets the PR base branch

Follow-up to the CI rework (#398). The smoke build previously de-duplicated by [.Name, .Branch], building both branches' rows (4 builds) on every image PR. This restricts smoke to the PR base branch via a new smoke_branch input wired to github.base_ref:

  • PR onto develop → smoke-tests the develop image rows (2 builds).
  • PR onto main (e.g. develop→main) → smoke-tests the main rows (2 builds).
  • Empty smoke_branch (e.g. workflow_dispatch) → builds both branches (4).

This gives 2 builds with correct-branch coverage — resolving the earlier review tension between "only main was validated" and "4 builds is wasteful."

Move VS Code recommendations to the workspace

.vscode/extensions.json is removed; its recommendations already exist in NxWitness.code-workspace, where all VS Code customizations belong. AGENTS.md / copilot-instructions.md now reference the workspace file and note the convention (open the workspace file, not the folder, so its settings/recommendations apply).

Verification

  • actionlint clean.
  • Filter simulated against Make/Matrix.json: smoke_branch=develop → 2 develop rows, main → 2 main rows, '' → 4 rows.

🤖 Generated with Claude Code

ptr727 and others added 2 commits June 3, 2026 10:43
In smoke mode, restrict the matrix to the PR base branch (github.base_ref)
via a new smoke_branch input, so a PR onto develop validates the develop
image rows and a PR onto main validates the main rows -- 2 builds instead
of 4, while still covering the correct branch. Empty smoke_branch (e.g.
workflow_dispatch) falls back to building both branches.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Remove .vscode/extensions.json; the extension recommendations already live
in NxWitness.code-workspace, where all VS Code customizations belong.
Update AGENTS.md (new "Workspace and linting" section) and
copilot-instructions.md to reference the workspace file and note the
convention (open the workspace file, not the folder, so its settings and
recommendations apply).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings June 3, 2026 17:44

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

This PR refines the GitHub Actions PR smoke build to validate only the matrix rows for the PR base branch (main vs develop), and consolidates VS Code configuration by removing .vscode/extensions.json in favor of the existing NxWitness.code-workspace recommendations.

Changes:

  • Wire a new smoke_branch input from test-pull-request.ymlbuild-docker-task.yml to filter smoke builds to github.base_ref (or build both branches when empty).
  • Update the jq matrix filtering logic in build-docker-task.yml to apply the smoke_branch restriction in smoke mode.
  • Remove .vscode/extensions.json and update docs to point contributors to NxWitness.code-workspace for editor settings/recommendations.

Reviewed changes

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

Show a summary per file
File Description
AGENTS.md Documents the workspace-first convention for VS Code settings/recommendations and updates CI linting references accordingly.
.vscode/extensions.json Removed; recommendations are now expected to live in NxWitness.code-workspace.
.github/workflows/test-pull-request.yml Passes github.base_ref into the reusable workflow so smoke builds target the PR base branch.
.github/workflows/build-docker-task.yml Adds smoke_branch input and applies it to the smoke-mode matrix filter via jq --arg sb.
.github/copilot-instructions.md Updates guidance to reference NxWitness.code-workspace instead of .vscode/extensions.json.

@ptr727
ptr727 merged commit 1f4e2b4 into develop Jun 3, 2026
8 checks passed
@ptr727
ptr727 deleted the smoke-target-base-branch branch June 3, 2026 17:51
ptr727 added a commit that referenced this pull request Jun 3, 2026
Promotes `develop` to `main`.

## Included
- **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](https://claude.com/claude-code)
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