Skip to content

chore: npm-check-updates && yarn upgrade (backport #18866)#18876

Closed
mergify[bot] wants to merge 2 commits intov2-mainfrom
mergify/bp/v2-main/pr-18866
Closed

chore: npm-check-updates && yarn upgrade (backport #18866)#18876
mergify[bot] wants to merge 2 commits intov2-mainfrom
mergify/bp/v2-main/pr-18866

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 8, 2022

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

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

You are currently cherry-picking commit d450d3f29.
  (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-containers/ecs-service-extensions/package.json
	modified:   packages/@aws-cdk/app-delivery/package.json
	modified:   packages/@aws-cdk/assets/package.json
	modified:   packages/@aws-cdk/aws-applicationautoscaling/package.json
	modified:   packages/@aws-cdk/aws-appmesh/package.json
	modified:   packages/@aws-cdk/aws-appsync/package.json
	modified:   packages/@aws-cdk/aws-athena/package.json
	modified:   packages/@aws-cdk/aws-autoscaling-common/package.json
	modified:   packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
	modified:   packages/@aws-cdk/aws-autoscaling/package.json
	modified:   packages/@aws-cdk/aws-batch/package.json
	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-cloudfront/package.json
	modified:   packages/@aws-cdk/aws-cloudtrail/package.json
	modified:   packages/@aws-cdk/aws-cloudwatch-actions/package.json
	modified:   packages/@aws-cdk/aws-cloudwatch/package.json
	modified:   packages/@aws-cdk/aws-codebuild/package.json
	modified:   packages/@aws-cdk/aws-codecommit/package.json
	modified:   packages/@aws-cdk/aws-codedeploy/package.json
	modified:   packages/@aws-cdk/aws-codepipeline-actions/package.json
	modified:   packages/@aws-cdk/aws-codepipeline/package.json
	modified:   packages/@aws-cdk/aws-cognito-identitypool/package.json
	modified:   packages/@aws-cdk/aws-cognito/package.json
	modified:   packages/@aws-cdk/aws-config/package.json
	modified:   packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/package.json
	modified:   packages/@aws-cdk/aws-dynamodb-global/package.json
	modified:   packages/@aws-cdk/aws-dynamodb/package.json
	modified:   packages/@aws-cdk/aws-ec2/package.json
	modified:   packages/@aws-cdk/aws-ecs-patterns/package.json
	modified:   packages/@aws-cdk/aws-ecs/package.json
	modified:   packages/@aws-cdk/aws-eks-legacy/package.json
	modified:   packages/@aws-cdk/aws-eks/package.json
	modified:   packages/@aws-cdk/aws-elasticloadbalancingv2-actions/package.json
	modified:   packages/@aws-cdk/aws-elasticloadbalancingv2-targets/package.json
	modified:   packages/@aws-cdk/aws-events-targets/package.json
	modified:   packages/@aws-cdk/aws-events/package.json
	modified:   packages/@aws-cdk/aws-globalaccelerator-endpoints/package.json
	modified:   packages/@aws-cdk/aws-glue/package.json
	modified:   packages/@aws-cdk/aws-iam/package.json
	modified:   packages/@aws-cdk/aws-iot/package.json
	modified:   packages/@aws-cdk/aws-iotevents/package.json
	modified:   packages/@aws-cdk/aws-kinesisanalytics-flink/package.json
	modified:   packages/@aws-cdk/aws-kinesisfirehose-destinations/package.json
	modified:   packages/@aws-cdk/aws-lambda-destinations/package.json
	modified:   packages/@aws-cdk/aws-lambda-event-sources/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-destinations/package.json
	modified:   packages/@aws-cdk/aws-logs/package.json
	modified:   packages/@aws-cdk/aws-msk/package.json
	modified:   packages/@aws-cdk/aws-rds/package.json
	modified:   packages/@aws-cdk/aws-redshift/package.json
	modified:   packages/@aws-cdk/aws-route53-patterns/package.json
	modified:   packages/@aws-cdk/aws-route53-targets/package.json
	modified:   packages/@aws-cdk/aws-route53/package.json
	modified:   packages/@aws-cdk/aws-s3-deployment/package.json
	modified:   packages/@aws-cdk/aws-s3-notifications/package.json
	modified:   packages/@aws-cdk/aws-s3/package.json
	modified:   packages/@aws-cdk/aws-sam/package.json
	modified:   packages/@aws-cdk/aws-servicediscovery/package.json
	modified:   packages/@aws-cdk/aws-ses-actions/package.json
	modified:   packages/@aws-cdk/aws-ses/package.json
	modified:   packages/@aws-cdk/aws-sns-subscriptions/package.json
	modified:   packages/@aws-cdk/aws-sns/package.json
	modified:   packages/@aws-cdk/aws-sqs/package.json
	modified:   packages/@aws-cdk/aws-ssm/package.json
	modified:   packages/@aws-cdk/aws-stepfunctions-tasks/package.json
	modified:   packages/@aws-cdk/cdk-assets-schema/package.json
	modified:   packages/@aws-cdk/cfnspec/package.json
	modified:   packages/@aws-cdk/cloud-assembly-schema/package.json
	modified:   packages/@aws-cdk/cloudformation-diff/package.json
	modified:   packages/@aws-cdk/cloudformation-include/package.json
	modified:   packages/@aws-cdk/core/package.json
	modified:   packages/@aws-cdk/cx-api/package.json
	modified:   packages/@aws-cdk/example-construct-library/package.json
	modified:   packages/@aws-cdk/lambda-layer-awscli/package.json
	modified:   packages/@aws-cdk/lambda-layer-kubectl/package.json
	modified:   packages/@aws-cdk/lambda-layer-node-proxy-agent/package.json
	modified:   packages/@aws-cdk/yaml-cfn/package.json
	modified:   packages/awslint/package.json
	modified:   packages/cdk-assets/package.json
	modified:   packages/cdk-dasm/package.json
	modified:   packages/monocdk/package.json
	modified:   scripts/@aws-cdk/script-tests/package.json
	modified:   tools/@aws-cdk/cdk-build-tools/package.json
	modified:   tools/@aws-cdk/cdk-release/package.json
	modified:   tools/@aws-cdk/cfn2ts/package.json
	modified:   tools/@aws-cdk/eslint-plugin/package.json
	modified:   tools/@aws-cdk/pkglint/package.json
	modified:   tools/@aws-cdk/prlint/package.json
	modified:   tools/@aws-cdk/yarn-cling/package.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packages/@aws-cdk/assert-internal/package.json
	both modified:   packages/@aws-cdk/assertions/package.json
	both modified:   packages/@aws-cdk/aws-ecr-assets/package.json
	both modified:   packages/@aws-cdk/aws-iot-actions/package.json
	both modified:   packages/@monocdk-experiment/assert/package.json
	both modified:   packages/aws-cdk-lib/package.json
	both modified:   packages/aws-cdk/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

Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.

(cherry picked from commit d450d3f)

# Conflicts:
#	packages/@aws-cdk/assert-internal/package.json
#	packages/@aws-cdk/assertions/package.json
#	packages/@aws-cdk/aws-ecr-assets/package.json
#	packages/@aws-cdk/aws-iot-actions/package.json
#	packages/@monocdk-experiment/assert/package.json
#	packages/aws-cdk-lib/package.json
#	packages/aws-cdk/package.json
#	yarn.lock
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Feb 8, 2022

@github-actions github-actions bot added the @aws-cdk/aws-cloudwatch Related to Amazon CloudWatch label Feb 8, 2022
@corymhall corymhall closed this Feb 8, 2022
@mergify mergify bot deleted the mergify/bp/v2-main/pr-18866 branch February 8, 2022 15:59
@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

AWS CodeBuild CI Report

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

@aws-cdk/aws-cloudwatch Related to Amazon CloudWatch conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants