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.83.1 #25921

Merged
merged 6 commits into from
Jun 13, 2023
Merged

chore(merge-back): 2.83.1 #25921

merged 6 commits into from
Jun 13, 2023

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Jun 9, 2023

See CHANGELOG

rix0rrr and others added 3 commits June 9, 2023 10:14
The problem would manifest as this error message:

```
❌ Deployment failed: Error: Duplicate use of node id: 07a6878c7a2ec9b49ef3c0ece94cef1c2dd20fba34ca9650dfa6e7e00f2b9961:current_account-current_region-build
```

The problem was that we were using the full asset "destination identifier" for both the build and publish steps, but then were trying to use the `source` object to deduplicate build steps.

A more robust solution is to only use the asset identifier (excluding the destination identifier) for the build step, which includes all data necessary to deduplicate the asset. No need to look at the source at all anymore.

----

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

----

*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 Jun 9, 2023
@gitpod-io
Copy link

gitpod-io bot commented Jun 9, 2023

@aws-cdk-automation aws-cdk-automation requested a review from a team June 9, 2023 11:37
@github-actions github-actions bot added the p2 label Jun 9, 2023
github-actions[bot]
github-actions bot previously approved these changes Jun 9, 2023
@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jun 9, 2023
@mergify
Copy link
Contributor

mergify bot commented Jun 9, 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 mergify bot dismissed github-actions[bot]’s stale review June 13, 2023 08:11

Pull request has been modified.

@RomainMuller RomainMuller enabled auto-merge (squash) June 13, 2023 09:27
@RomainMuller RomainMuller removed the request for review from a team June 13, 2023 09:27
@mergify
Copy link
Contributor

mergify bot commented Jun 13, 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).

@RomainMuller RomainMuller merged commit 7a6758d into main Jun 13, 2023
@RomainMuller RomainMuller deleted the merge-back/2.83.1 branch June 13, 2023 09:57
@aws-cdk-automation
Copy link
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 62c7d3b
  • 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
auto-approve p2 pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. 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.

3 participants