Skip to content

sync-preview: merge main into preview#1045

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

sync-preview: merge main into preview#1045
aidandaly24 merged 4 commits into
previewfrom
sync-preview/merge-main-20260429-v6

Conversation

@aidandaly24
Copy link
Copy Markdown
Contributor

Summary

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

github-actions Bot and others added 4 commits April 29, 2026 19:35
…aret range (#1044)

Remove the auto-sync step that bumped @aws/agentcore-cdk during releases
— version updates will be managed manually via PRs. Restore the caret
range (^0.1.0-alpha.19) in the asset and snapshot that was dropped by
the auto-sync in #1042.
# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json
@aidandaly24 aidandaly24 requested a review from a team April 29, 2026 20:09
@github-actions github-actions Bot added the agentcore-harness-reviewing AgentCore Harness review in progress label Apr 29, 2026
@aidandaly24 aidandaly24 merged commit ae3f90f into preview Apr 29, 2026
15 checks passed
@aidandaly24 aidandaly24 deleted the sync-preview/merge-main-20260429-v6 branch April 29, 2026 20:11
@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 #2153 for commit d8b8bd3 by the Vitest Coverage Report Action

@agentcore-cli-automation
Copy link
Copy Markdown

🚨 This PR is based on a stale preview and will regress recent merges

The merge commit in this PR (d8b8bd3) has parents 01b3b7d (preview side) and 27ce126 (main side), but 01b3b7d is not the current tip of preview. Since the branch was cut, two things have landed on preview that are not included here:

  1. 626872f — feat(tests): add E2E and integration tests for Harness primitive (feat(tests): add E2E and integration tests for Harness primitive #1021)
  2. 352c79c — Merge pull request Release v1.0.0-preview.4 (preview) #1041 from aws/release/v1.0.0-preview.4 (bumps version to 1.0.0-preview.4 + CHANGELOG entries)

As a result, the net diff of this PR against current preview is 7 insertions / 458 deletions across 12 files (instead of just the 36-line workflow change from #1044). Merging as-is would revert:

  • package.json version: 1.0.0-preview.41.0.0-preview.3
  • package-lock.json accordingly
  • CHANGELOG.md entries for 1.0.0-preview.4
  • Delete e2e-tests/harness-bedrock.test.ts
  • Delete e2e-tests/harness-e2e-helper.ts
  • Delete e2e-tests/harness-gemini.test.ts
  • Delete e2e-tests/harness-openai.test.ts
  • Delete integ-tests/add-remove-harness.test.ts
  • Revert the harness-bedrock.test.ts baseline additions in .github/workflows/e2e-tests.yml

You can confirm with:

git diff origin/preview..origin/sync-preview/merge-main-20260429-v6 --stat

Options to fix

  1. Re-create the sync branch from current preview tip (352c79c) and re-merge main into it, then force-push to sync-preview/merge-main-20260429-v6. This is the cleanest fix.
  2. Open a new sync PR from a fresh branch cut off current preview, and close this one.

Given the PR description says "You MUST merge this PR using 'Create a merge commit'," merging it in its current state would directly delete PR #1021's tests and the preview.4 release from the preview branch.

@github-actions github-actions Bot removed the agentcore-harness-reviewing AgentCore Harness review in progress label Apr 29, 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.

3 participants