Skip to content

Commit 1b22ebc

Browse files
authored
chore: in tests, publish both upstream and candidate versions of schema (#222)
We need 2 different versions of `@aws-cdk/cloud-assembly-schema` versions available at the same time: - The candidate version is used by `cdk-assets` (which doesn't bundle it) - The released version is used by `aws-cdk-lib` (which is used as part of tests. Requires updating to a new version of cdklabs-projen-project-types. --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license
1 parent 0c21495 commit 1b22ebc

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

.github/workflows/integ.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,17 +1396,20 @@ new CdkCliIntegTestsWorkflow(repo, {
13961396
testRunsOn: POWERFUL_RUNNER,
13971397

13981398
localPackages: [
1399-
// CloudAssemblySchema is not in this list because in the way we're doing
1400-
// Verdaccio now, its 0.0.0 version will shadow the ACTUAL published version
1401-
// that aws-cdk-lib depends on, and so will not be found.
1402-
//
1403-
// Not sure if that will cause problems yet.
1399+
cloudAssemblySchema.name,
14041400
cloudFormationDiff.name,
14051401
cdkAssets.name,
14061402
cli.name,
14071403
cliLib.name,
14081404
cdkAliasPackage.name,
14091405
],
1406+
1407+
allowUpstreamVersions: [
1408+
// cloud-assembly-schema gets referenced under multiple versions
1409+
// - Candidate version for cdk-assets
1410+
// - Previously released version for aws-cdk-lib
1411+
cloudAssemblySchema.name,
1412+
],
14101413
});
14111414

14121415
new CodeCovWorkflow(repo, {

package.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

yarn.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)