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: update dependabot and yarn-upgrade config #19942

Merged
merged 5 commits into from
Jun 1, 2022
Merged

Conversation

kaizencc
Copy link
Contributor

@kaizencc kaizencc commented Apr 15, 2022

Closes https://github.com/cdklabs/cdk-ops/issues/1942

The idea is to copy the configuration we already have for the default branch and target/checkout v1-main on June 1.
It is a bit ugly but -- we are not likely to do this again to any other branch, and I can't think of a better way. I have tested the changes on my own forked repository and confirmed that we do indeed target/checkout a different branch under the new configuration.

Before this PR is merged, we should double-check and make sure that yarn-update has not diverged. Targeting v2-main as that will be the default branch when this PR gets merged (I assume the conflicts will be resolved when v2-main gets forward merged).


All Submissions:

Adding new Unconventional Dependencies:

  • This PR adds new unconventional dependencies following the process described here

New Features

  • Have you added the new feature to an integration test?
    • Did you use yarn integ to deploy the infrastructure and generate the snapshot (i.e. yarn integ without --dry-run)?

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

@kaizencc kaizencc added the pr/do-not-merge This PR should not be merged at this time. label Apr 15, 2022
@kaizencc kaizencc requested a review from madeline-k April 15, 2022 22:13
@kaizencc kaizencc self-assigned this Apr 15, 2022
@gitpod-io
Copy link

gitpod-io bot commented Apr 15, 2022

@github-actions github-actions bot added the p2 label Apr 15, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team April 15, 2022 22:14
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Apr 15, 2022
Comment on lines +19 to +20
with:
ref: v1-main
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is 1 of 2 changes between this file and yarn-upgrade.yml.

Comment on lines +105 to +106
with:
ref: v1-main
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the other. peter-evans/create-pull-request creates a pull request to the branch checked out in the workflow.

@kaizencc kaizencc changed the base branch from master to v2-main April 15, 2022 22:19
Copy link
Contributor

@madeline-k madeline-k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaizen3031593, it looks like this PR accidentally has a bunch of unrelated changes in it? Integration tests, README, CfnSpec files, etc. Can you remove them?

@kaizencc
Copy link
Contributor Author

@madeline-k I think the unrelated changes has to do with v1 not being in sync with v2. The forward merge got through to v2-main yesterday, so updated the PR and I think the changes have gone away

@kaizencc kaizencc requested a review from madeline-k April 20, 2022 20:32
Copy link
Contributor

@madeline-k madeline-k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving, but please do not remove the "do-not-merge" label

@TheRealAmazonKendra TheRealAmazonKendra removed the pr/do-not-merge This PR should not be merged at this time. label Jun 1, 2022
@mergify
Copy link
Contributor

mergify bot commented Jun 1, 2022

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

@mergify
Copy link
Contributor

mergify bot commented Jun 1, 2022

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: ea04817
  • 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 cea1039 into main Jun 1, 2022
@mergify mergify bot deleted the conroy/upgradeconfig branch June 1, 2022 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.

4 participants