Skip to content

chore(merge-back): 1.148.0#19323

Merged
mergify[bot] merged 5 commits intomasterfrom
merge-back/1.148.0
Mar 10, 2022
Merged

chore(merge-back): 1.148.0#19323
mergify[bot] merged 5 commits intomasterfrom
merge-back/1.148.0

Conversation

@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

@aws-cdk-automation aws-cdk-automation commented Mar 10, 2022

See CHANGELOG

RomainMuller and others added 4 commits March 9, 2022 18:09
The default `projen` build step re-generates the `package.json` file and
re-install dependencies, which breaks in case the `align-versions.sh`
script was run (as the re-generated `package.json` has version `0.0.0`
again).

This inserts a hack to reset the `build` script and make it a synonym
to the `compile` script.

This was breaking the `jsii` integration tests (they try to build, but
not test, `aws-cdk`).
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Mar 10, 2022

@aws-cdk-automation aws-cdk-automation added auto-approve pr/no-squash This PR should be merged instead of squash-merging it labels Mar 10, 2022
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 10, 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
Copy Markdown
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 5c33179
  • 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 aa07010 into master Mar 10, 2022
@mergify mergify bot deleted the merge-back/1.148.0 branch March 10, 2022 05:31
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 10, 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 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