chore: bring init-template package files under auto-upgrade control#19893
Merged
mergify[bot] merged 4 commits intomasterfrom Apr 27, 2022
Merged
chore: bring init-template package files under auto-upgrade control#19893mergify[bot] merged 4 commits intomasterfrom
mergify[bot] merged 4 commits intomasterfrom
Conversation
The init template package manager files used to be named `package.template.json`, `pom.template.xml`, because they contained placeholders. This naming scheme makes Dependabot and `npm-check-updates` ignore them. Rename the files to their "official" names, do placeholder substitutions in a hook script instead. - Add Dependabot config to make it watch the non-NPM package manager files. - Add to our "Yarn upgrade" script for the NPM upgrades.
|
|
Chriscbr
approved these changes
Apr 21, 2022
Contributor
Chriscbr
left a comment
There was a problem hiding this comment.
This looks okay to me, though it looks like pkglint is tripping up the build:
aws-cdk: TypeError: Invalid comparator: %cdk-version%
aws-cdk: at Comparator.parse (/codebuild/output/src349889751/src/github.com/aws/aws-cdk/tools/@aws-cdk/pkglint/node_modules/semver/classes/comparator.js:38:13)
aws-cdk: at new Comparator (/codebuild/output/src349889751/src/github.com/aws/aws-cdk/tools/@aws-cdk/pkglint/node_modules/semver/classes/comparator.js:22:10)
aws-cdk: at /codebuild/output/src349889751/src/github.com/aws/aws-cdk/tools/@aws-cdk/pkglint/node_modules/semver/classes/range.js:133:47
aws-cdk: at Array.map (<anonymous>)
aws-cdk: at Range.parseRange (/codebuild/output/src349889751/src/github.com/aws/aws-cdk/tools/@aws-cdk/pkglint/node_modules/semver/classes/range.js:133:35)
aws-cdk: at /codebuild/output/src349889751/src/github.com/aws/aws-cdk/tools/@aws-cdk/pkglint/node_modules/semver/classes/range.js:34:22
aws-cdk: at Array.map (<anonymous>)
aws-cdk: at new Range (/codebuild/output/src349889751/src/github.com/aws/aws-cdk/tools/@aws-cdk/pkglint/node_modules/semver/classes/range.js:34:8)
aws-cdk: at Object.intersects (/codebuild/output/src349889751/src/github.com/aws/aws-cdk/tools/@aws-cdk/pkglint/node_modules/semver/ranges/intersects.js:3:8)
aws-cdk: at RegularDependenciesMustSatisfyPeerDependencies.validate (/codebuild/output/src349889751/src/github.com/aws/aws-cdk/tools/@aws-cdk/pkglint/lib/rules.js:1080:25)
aws-cdk: Error: pkglint exited with error code 1
Contributor
|
Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Collaborator
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Contributor
|
Thank you for contributing! Your pull request will be updated from master and then merged automatically (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
Jun 21, 2022
In #19893, we added init-templates `package.json` files to our automatic upgrades mechanism. The packages `jest` and `ts-jest` were (not sure why...), added to the rejection list, i.e they specifically will not be upgraded; However, `@types/jest` was not added to this list, thereby creating a potential major version mismatch between them. This is exactly what happened here: #20751 This PR rejects upgrades to `@types/jest` as well, to keep them in sync. ---- ### All Submissions: * [X] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
daschaa
pushed a commit
to daschaa/aws-cdk
that referenced
this pull request
Jul 9, 2022
In aws#19893, we added init-templates `package.json` files to our automatic upgrades mechanism. The packages `jest` and `ts-jest` were (not sure why...), added to the rejection list, i.e they specifically will not be upgraded; However, `@types/jest` was not added to this list, thereby creating a potential major version mismatch between them. This is exactly what happened here: aws#20751 This PR rejects upgrades to `@types/jest` as well, to keep them in sync. ---- ### All Submissions: * [X] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The init template package manager files used to be named
package.template.json,pom.template.xml, because they containedplaceholders. This naming scheme makes Dependabot and
npm-check-updatesignore them.Rename the files to their "official" names, do placeholder substitutions
in a hook script instead.
files.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license