Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(merge-back): 2.99.1 #27363

Merged
merged 6 commits into from
Oct 4, 2023
Merged

chore(merge-back): 2.99.1 #27363

merged 6 commits into from
Oct 4, 2023

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Sep 30, 2023

See CHANGELOG

rix0rrr and others added 4 commits September 29, 2023 10:07
This is a follow-up to #27217

The check we needed to perform was inverted 😖


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
See CHANGELOG

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…27353)

Fully revert the `lazify` feature -- it was not switched on properly before, and switching it on now leads to ESM problems.

Revert first, we will try it again later.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
@aws-cdk-automation aws-cdk-automation added auto-approve pr/no-squash This PR should be merged instead of squash-merging it labels Sep 30, 2023
@github-actions github-actions bot added the p2 label Sep 30, 2023
github-actions[bot]
github-actions bot previously approved these changes Sep 30, 2023
@aws-cdk-automation aws-cdk-automation requested a review from a team September 30, 2023 11:55
@mergify
Copy link
Contributor

mergify bot commented Sep 30, 2023

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

@aws-cdk-automation
Copy link
Collaborator Author

This PR cannot be merged because it has conflicts. Please resolve them. The PR will be considered stale and closed if it remains in an unmergeable state.

@rix0rrr rix0rrr added the pr/do-not-merge This PR should not be merged at this time. label Oct 4, 2023
@mergify mergify bot dismissed GitHub Actions’s stale review October 4, 2023 09:41

Pull request has been modified.

github-actions[bot]
github-actions bot previously approved these changes Oct 4, 2023
@rix0rrr rix0rrr force-pushed the merge-back/2.99.1 branch 2 times, most recently from 78d9798 to 537ed97 Compare October 4, 2023 09:43
@mergify mergify bot dismissed GitHub Actions’s stale review October 4, 2023 09:43

Pull request has been modified.

@rix0rrr rix0rrr removed the pr/do-not-merge This PR should not be merged at this time. label Oct 4, 2023
@mergify
Copy link
Contributor

mergify bot commented Oct 4, 2023

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

@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Oct 4, 2023
@mergify
Copy link
Contributor

mergify bot commented Oct 4, 2023

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

@aws-cdk-automation
Copy link
Collaborator Author

AWS CodeBuild CI Report

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

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

@mergify mergify bot merged commit e986eeb into main Oct 4, 2023
13 of 14 checks passed
@mergify mergify bot deleted the merge-back/2.99.1 branch October 4, 2023 11:09
@mergify
Copy link
Contributor

mergify bot commented Oct 4, 2023

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-approve p2 pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. pr/no-squash This PR should be merged instead of squash-merging it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants