Skip to content

chore: merge main into preview manually due to workflow changes#1064

Closed
Hweinstock wants to merge 3 commits intopreviewfrom
main
Closed

chore: merge main into preview manually due to workflow changes#1064
Hweinstock wants to merge 3 commits intopreviewfrom
main

Conversation

@Hweinstock
Copy link
Copy Markdown
Contributor

Description

Merge into main is failing since workflow files were adjusted:

Run git fetch origin main
From https://github.com/aws/agentcore-cli
 * branch            main       -> FETCH_HEAD
ℹ️  Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
 .github/workflows/e2e-tests-full.yml           |  5 +++--
 browser-tests/tests/traces.test.ts             | 30 ++++++++++++++++++++------
 docs/TESTING.md                                | 18 ++++++++++++++++
 e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
 e2e-tests/fixtures/import/common.py            |  6 +++++-
 e2e-tests/import-gateway.test.ts               |  4 +++-
 e2e-tests/import-resources.test.ts             |  4 +++-
 package-lock.json                              |  8 +++----
 package.json                                   |  2 +-
 9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview.        
remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview        
remote: 
remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission        
remote: 
remote: - Changes must be made through a pull request.        
remote: 
To https://github.com/aws/agentcore-cli
 ! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.

Related Issue

Closes #

Documentation PR

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update
  • Other (please describe):

Testing

How have you tested the change?

  • I ran npm run test:unit and npm run test:integ
  • I ran npm run typecheck
  • I ran npm run lint
  • If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

  • I have read the CONTRIBUTING document
  • I have added any necessary tests that prove my fix is effective or my feature works
  • I have updated the documentation accordingly
  • I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  • My changes generate no new warnings
  • Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

avi-alpert and others added 3 commits April 30, 2026 11:09
* ci: shard e2e full suite across 6 runners

- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts

* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@Hweinstock Hweinstock requested a review from a team April 30, 2026 18:38
@github-actions github-actions Bot added the agentcore-harness-reviewing AgentCore Harness review in progress label Apr 30, 2026
@Hweinstock Hweinstock closed this Apr 30, 2026
@agentcore-cli-automation
Copy link
Copy Markdown

Reviewed. This is a straightforward sync-forward merge of three commits already on main (278783a, 4daca83, 90f17b4) into preview, needed because the automated sync can't push workflow changes. No merge-conflict resolutions or new code are introduced by this PR — the diff matches exactly what's already on main. The constituent changes (e2e sharding in #1016 and the agent-inspector 0.3.0 bump) were reviewed in their original PRs.

LGTM 👍

@github-actions github-actions Bot removed the agentcore-harness-reviewing AgentCore Harness review in progress label Apr 30, 2026
@github-actions
Copy link
Copy Markdown
Contributor

Coverage Report

Status Category Percentage Covered / Total
🔵 Lines 43.43% 8717 / 20067
🔵 Statements 42.78% 9228 / 21569
🔵 Functions 41.01% 1475 / 3596
🔵 Branches 40.66% 5683 / 13976
Generated in workflow #2211 for commit 90f17b4 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