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: version updates, including breaking changes in jsii (backport #22382) #22464

Merged
merged 7 commits into from
Oct 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2022

This is an automatic backport of pull request #22382 done by Mergify.
Cherry-pick of f169d7f has failed:

On branch mergify/bp/v1-main/pr-22382
Your branch is up to date with 'origin/v1-main'.

You are currently cherry-picking commit f169d7f73d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json
	modified:   packages/@aws-cdk/aws-cloudformation/package.json
	modified:   packages/@aws-cdk/aws-dynamodb/package.json
	modified:   packages/@aws-cdk/aws-ec2/package.json
	modified:   packages/@aws-cdk/aws-ec2/test/vpn.test.ts
	modified:   packages/@aws-cdk/aws-iam/package.json
	modified:   packages/@aws-cdk/aws-lambda-nodejs/package.json
	modified:   packages/@aws-cdk/aws-lambda/package.json
	modified:   packages/@aws-cdk/aws-logs/package.json
	modified:   packages/@aws-cdk/aws-route53/package.json
	modified:   packages/@aws-cdk/aws-s3/package.json
	modified:   packages/@aws-cdk/aws-ses/package.json
	modified:   packages/@aws-cdk/custom-resources/package.json
	modified:   tools/@aws-cdk/cdk-build-tools/lib/deprecated-symbols.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   package.json
	both modified:   packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
	both modified:   packages/@aws-cdk/aws-ec2/lib/vpc.ts
	both modified:   packages/@aws-cdk/aws-ec2/test/vpc.test.ts
	both modified:   packages/@aws-cdk/aws-eks/package.json
	both modified:   packages/@aws-cdk/cloudformation-diff/package.json
	both modified:   packages/@aws-cdk/core/package.json
	both modified:   packages/@aws-cdk/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts
	deleted by us:   packages/@aws-cdk/custom-resources/test/aws-custom-resource/integ.aws-custom-resource-vpc.ts
	both modified:   packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
	both modified:   packages/@aws-cdk/integ-runner/package.json
	both modified:   packages/@aws-cdk/integ-tests/package.json
	both modified:   packages/@monocdk-experiment/assert/package.json
	both modified:   packages/@monocdk-experiment/rewrite-imports/package.json
	both modified:   packages/aws-cdk-lib/package.json
	both modified:   packages/aws-cdk-migration/package.json
	both modified:   packages/aws-cdk/THIRD_PARTY_LICENSES
	both modified:   packages/aws-cdk/package.json
	both modified:   packages/awslint/package.json
	both modified:   packages/cdk-assets/package.json
	both modified:   packages/cdk-cli-wrapper/package.json
	both modified:   packages/cdk-dasm/package.json
	both modified:   packages/monocdk/package.json
	both modified:   tools/@aws-cdk/cdk-build-tools/package.json
	both modified:   tools/@aws-cdk/cfn2ts/package.json
	both modified:   tools/@aws-cdk/eslint-plugin/package.json
	both modified:   tools/@aws-cdk/node-bundle/package.json
	both modified:   tools/@aws-cdk/prlint/package.json
	both modified:   tools/@aws-cdk/yarn-cling/package.json
	both modified:   yarn.lock

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

This is a re-roll of #22269 but in a PR and branch that the GitHub Action will not continuously overwrite so I can fix the branch over a long period.

----

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

(cherry picked from commit f169d7f)

# Conflicts:
#	package.json
#	packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
#	packages/@aws-cdk/aws-ec2/lib/vpc.ts
#	packages/@aws-cdk/aws-ec2/test/vpc.test.ts
#	packages/@aws-cdk/aws-eks/package.json
#	packages/@aws-cdk/cloudformation-diff/package.json
#	packages/@aws-cdk/core/package.json
#	packages/@aws-cdk/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts
#	packages/@aws-cdk/custom-resources/test/aws-custom-resource/integ.aws-custom-resource-vpc.ts
#	packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
#	packages/@aws-cdk/integ-runner/package.json
#	packages/@aws-cdk/integ-tests/package.json
#	packages/@monocdk-experiment/assert/package.json
#	packages/@monocdk-experiment/rewrite-imports/package.json
#	packages/aws-cdk-lib/package.json
#	packages/aws-cdk-migration/package.json
#	packages/aws-cdk/THIRD_PARTY_LICENSES
#	packages/aws-cdk/package.json
#	packages/awslint/package.json
#	packages/cdk-assets/package.json
#	packages/cdk-cli-wrapper/package.json
#	packages/cdk-dasm/package.json
#	packages/monocdk/package.json
#	tools/@aws-cdk/cdk-build-tools/package.json
#	tools/@aws-cdk/cfn2ts/package.json
#	tools/@aws-cdk/eslint-plugin/package.json
#	tools/@aws-cdk/node-bundle/package.json
#	tools/@aws-cdk/prlint/package.json
#	tools/@aws-cdk/yarn-cling/package.json
#	yarn.lock
@gitpod-io
Copy link

gitpod-io bot commented Oct 11, 2022

@github-actions github-actions bot added the p2 label Oct 11, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team October 11, 2022 21:00
@comcalvi comcalvi force-pushed the mergify/bp/v1-main/pr-22382 branch from 1427556 to 4d29e1e Compare October 11, 2022 23:20
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: fe7bdd2
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify
Copy link
Contributor Author

mergify bot commented Oct 12, 2022

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 9632c2f into v1-main Oct 12, 2022
@mergify mergify bot deleted the mergify/bp/v1-main/pr-22382 branch October 12, 2022 21:24
@HBobertz HBobertz mentioned this pull request Nov 10, 2022
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants