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.32.1 #21178

Merged
merged 9 commits into from
Jul 16, 2022
Merged

chore(merge-back): 2.32.1 #21178

merged 9 commits into from
Jul 16, 2022

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Jul 16, 2022

See CHANGELOG

mergify bot and others added 8 commits July 15, 2022 10:35
This is an automatic backport of pull request #21152 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

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](https://dashboard.mergify.com/) you can:

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

Finally, you can contact us on https://mergify.com
</details>
… for consistency with cdk deploy CLI" (#21174)

#19950 breaks users who use bundling inside a pipeline stack. Previously we converted `Stage/Stack` to `Stage-Stack` and left a comment as to why that was necessary. This comment was both insufficient and disregarded, which resulted in different behavior between the bundling logic and skip bundling logic. The asset path for skip bundling would not longer be the same as the asset path when bundling, so the asset would not be found.
@aws-cdk-automation aws-cdk-automation added auto-approve pr/no-squash This PR should be merged instead of squash-merging it labels Jul 16, 2022
@gitpod-io
Copy link

gitpod-io bot commented Jul 16, 2022

@aws-cdk-automation aws-cdk-automation requested a review from a team July 16, 2022 03:35
@github-actions github-actions bot added the p2 label Jul 16, 2022
@mergify
Copy link
Contributor

mergify bot commented Jul 16, 2022

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: 87283e0
  • 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 4525be8 into main Jul 16, 2022
@mergify mergify bot deleted the merge-back/2.32.1 branch July 16, 2022 04:15
@mergify
Copy link
Contributor

mergify bot commented Jul 16, 2022

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/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