Skip to content

Conversation

@moelasmar
Copy link
Contributor

Fixing the commits conflict between main and v2-release branches

AWS CDK Team and others added 3 commits January 15, 2025 19:39
# Conflicts:
#	packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
#	packages/aws-cdk-lib/recommended-feature-flags.json
@aws-cdk-automation aws-cdk-automation requested a review from a team January 24, 2025 01:41
@github-actions github-actions bot added the p2 label Jan 24, 2025
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jan 24, 2025
@codecov
Copy link

codecov bot commented Jan 24, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.54%. Comparing base (aea8f3b) to head (1bbfe2e).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #33114   +/-   ##
=======================================
  Coverage   81.54%   81.54%           
=======================================
  Files         226      226           
  Lines       13777    13777           
  Branches     2414     2414           
=======================================
  Hits        11235    11235           
  Misses       2270     2270           
  Partials      272      272           
Flag Coverage Δ
suite.unit 81.54% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
packages/aws-cdk 80.94% <ø> (ø)
packages/aws-cdk-lib/core 82.17% <ø> (ø)

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 1bbfe2e
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Jan 24, 2025

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit dc0cb8d into main Jan 24, 2025
32 checks passed
@mergify mergify bot deleted the melasmar/sync_release_main branch January 24, 2025 02:17
@github-actions
Copy link
Contributor

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 24, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

contribution/core This is a PR that came from AWS. p2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants