Skip to content

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

Closed
Hweinstock wants to merge 3 commits intopreviewfrom
merge-into-preview
Closed

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

Conversation

@Hweinstock
Copy link
Copy Markdown
Contributor

@Hweinstock Hweinstock commented Apr 30, 2026

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): branch hygiene

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
@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
@github-actions
Copy link
Copy Markdown
Contributor

Coverage Report

Status Category Percentage Covered / Total
🔵 Lines 43.44% 8718 / 20067
🔵 Statements 42.79% 9230 / 21569
🔵 Functions 41.07% 1477 / 3596
🔵 Branches 40.66% 5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action

@agentcore-cli-automation
Copy link
Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.

A couple of things I checked that are fine but worth noting:

  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.

LGTM to merge.

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

3 participants