Skip to content

sync-preview: merge main into preview#1040

Merged
aidandaly24 merged 2 commits into
previewfrom
sync-preview/merge-main-20260429-v5
Apr 29, 2026
Merged

sync-preview: merge main into preview#1040
aidandaly24 merged 2 commits into
previewfrom
sync-preview/merge-main-20260429-v5

Conversation

@aidandaly24
Copy link
Copy Markdown
Contributor

Summary

⚠️ You MUST merge this PR using "Create a merge commit". NOT squash. NOT rebase.

aidandaly24 and others added 2 commits April 29, 2026 15:25
The create.test.ts tests require uv for Python project scaffolding.
The Build and Test workflow installs it via astral-sh/setup-uv, but
the release workflow's prepare steps were missing it, causing test
failures during the snapshot update step.
@github-actions github-actions Bot added the agentcore-harness-reviewing AgentCore Harness review in progress label Apr 29, 2026
@agentcore-cli-automation
Copy link
Copy Markdown

Reviewed. This is a sync PR whose sole purpose is to restore the two-parent ancestry link between main and preview that was broken when #1039 squash-merged #1038.

Verified:

  • The merge commit ecda10c has two parents (01b3b7d = preview tip, 29ae8e5 = main tip), as required.
  • git diff preview..ecda10c is empty — preview already contains all main content (via the prior squash), so the merge correctly resolves to preview's tree with no file changes.
  • The PR body already calls out the critical merge-strategy requirement ("Create a merge commit", not squash, not rebase). Squashing this PR would destroy the two-parent structure and defeat its purpose, so whoever merges must respect that.

No code-level issues to flag. LGTM — just make sure to use Create a merge commit when merging.

@github-actions github-actions Bot removed the agentcore-harness-reviewing AgentCore Harness review in progress label Apr 29, 2026
@notgitika notgitika self-requested a review April 29, 2026 19:30
@aidandaly24 aidandaly24 merged commit dd76d17 into preview Apr 29, 2026
15 checks passed
@aidandaly24 aidandaly24 deleted the sync-preview/merge-main-20260429-v5 branch April 29, 2026 19:30
@github-actions
Copy link
Copy Markdown
Contributor

Coverage Report

Status Category Percentage Covered / Total
🔵 Lines 43.43% 8702 / 20036
🔵 Statements 42.77% 9213 / 21537
🔵 Functions 40.95% 1468 / 3584
🔵 Branches 40.67% 5678 / 13960
Generated in workflow #2144 for commit ecda10c by the Vitest Coverage Report Action

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.

3 participants