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): 1.199.0 #24893

Merged
merged 7 commits into from
Mar 31, 2023
Merged

chore(merge-back): 1.199.0 #24893

merged 7 commits into from
Mar 31, 2023

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Mar 31, 2023

See CHANGELOG

corymhall and others added 6 commits March 28, 2023 12:34
…) (#24829)

----

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

https://github.com/aws/aws-cdk/blob/patch/v1.198.1/CHANGELOG.md

----

*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 Mar 31, 2023
@github-actions github-actions bot added the p2 label Mar 31, 2023
@aws-cdk-automation aws-cdk-automation requested a review from a team March 31, 2023 16:03
@mergify
Copy link
Contributor

mergify bot commented Mar 31, 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: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: f61a348
  • 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 4e90d62 into v1-main Mar 31, 2023
@mergify mergify bot deleted the merge-back/1.199.0 branch March 31, 2023 17:36
@mergify
Copy link
Contributor

mergify bot commented Mar 31, 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).

mergify bot pushed a commit that referenced this pull request Apr 4, 2023
Reverts #24893

The merge back mistakenly bumped to version `1.199.0` even though the release associated with it was for `1.198.1`.
It happened because th `1.199.0` release got triggered before `1.198.1` finished, and the merge back build reads the current version from the latest `v1-release` branch, instead of the commit that triggered it. 

Long story short, the [latest v1 version](https://www.npmjs.com/package/aws-cdk?activeTab=versions) is `1.198.1`, so thats what we should have in the code.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-approve p2 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