Skip to content

chore(merge-back): 1.129.0#17105

Merged
mergify[bot] merged 10 commits intomasterfrom
merge-back/1.129.0
Oct 22, 2021
Merged

chore(merge-back): 1.129.0#17105
mergify[bot] merged 10 commits intomasterfrom
merge-back/1.129.0

Conversation

@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

@aws-cdk-automation aws-cdk-automation commented Oct 21, 2021

See CHANGELOG

rix0rrr and others added 5 commits October 20, 2021 15:52
This form of executing Rosetta is not mocked by the jsii integ tests
(which try executing a CDK build using a new version of the jsii tools).

The jsii integ tests rely on passing environment variables `$CDK_BUILD_JSII`,
`$PACMAK` and `$ROSETTA` (instead of replacing symlinks in the Node module farm).

This leads to the generation of `.jsii.tabl.json` during build using the
NPM-installed version of `jsii-rosetta`, which subsequently interferes with
the run of `$PACMAK` which *is* the new version (since Rosetta tablets
are supposed to be short-lived, there is no backwards compatibility guarantee
between different versions).

There will be a supported mechanism to achieve what this single post-build command is trying to achieve,
so remove it.

----

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

(cherry picked from commit ac54842)
chore(assertions): remove `rosetta:extract` from build command
@aws-cdk-automation aws-cdk-automation added pr/auto-approve Notifies the GH action to auto-approve this PR pr/no-squash This PR should be merged instead of squash-merging it labels Oct 21, 2021
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Oct 21, 2021

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 21, 2021

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
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 21, 2021

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
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 21, 2021

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
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 22, 2021

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
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 22, 2021

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
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 22, 2021

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
Copy Markdown
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: d69d05a
  • 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 09b02f0 into master Oct 22, 2021
@mergify mergify bot deleted the merge-back/1.129.0 branch October 22, 2021 03:09
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 22, 2021

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

pr/auto-approve Notifies the GH action to auto-approve this PR 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