Skip to content

Commit c0fc6f7

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/packages/aws-cdk/toolkit-lib/aws-cdk-lib-2.235.1
2 parents 496f0bb + 78ed91b commit c0fc6f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+927
-477
lines changed

.gitattributes

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

.github/workflows/auto-queue.yml

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

.github/workflows/build.yml

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

.github/workflows/issue-label-assign.yml

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

.github/workflows/self-mutation.yml

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

.github/workflows/upgrade-aws-cdk-lib_aws-cdk.yml

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

.github/workflows/upgrade.yml

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

.gitignore

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

.projen/files.json

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

.projenrc.ts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,28 @@ import { LargePrChecker } from './projenrc/large-pr-checker';
1515
import { PrLabeler } from './projenrc/pr-labeler';
1616
import { RecordPublishingTimestamp } from './projenrc/record-publishing-timestamp';
1717
import { DocType, S3DocsPublishing } from './projenrc/s3-docs-publishing';
18+
import { SelfMutationOnForks } from './projenrc/SelfMutationOnForks';
1819
import { TypecheckTests } from './projenrc/TypecheckTests';
1920

2021
// #region shared config
2122

2223
const TYPESCRIPT_VERSION = '5.9';
2324

25+
/**
26+
* Global note on customizeReference
27+
* ---------------------------------
28+
*
29+
* All packages references using `customizeReference()` should have an `^0.0.0`
30+
* dependency in `package.json` regardless of what the argument to
31+
* `customizeReference()` is. This because unbump will always set the range
32+
* specified to that value, and if it used to be something else then we will
33+
* introduce a git diff that stops the release. Do not worry, the bumped version
34+
* will have the correct range character.
35+
*
36+
* When adding a fresh package, projen sometimes inserts `"0.0.0"` there, if
37+
* that happens you need to edit `package.json` once by hand.
38+
*/
39+
2440
/**
2541
* When adding an SDK dependency for a library, use this function
2642
*
@@ -254,6 +270,10 @@ const repoProject = new yarn.Monorepo({
254270
},
255271

256272
githubOptions: {
273+
projenCredentials: pj.github.GithubCredentials.fromPersonalAccessToken({
274+
secret: 'PROJEN_GITHUB_TOKEN',
275+
environment: 'automation',
276+
}),
257277
mergify: false,
258278
mergeQueue: true,
259279
mergeQueueOptions: {
@@ -292,6 +312,9 @@ const repoProject = new yarn.Monorepo({
292312
new AdcPublishing(repoProject);
293313
new RecordPublishingTimestamp(repoProject);
294314
new BootstrapTemplateProtection(repoProject);
315+
new SelfMutationOnForks(repoProject, { environment: 'automation' });
316+
317+
repoProject.gitignore.addPatterns('.vscode/settings.json');
295318

296319
// Eslint for projen config
297320
// @ts-ignore
@@ -506,7 +529,9 @@ const cloudAssemblyApi = configureProject(
506529
description: 'API for working with Cloud Assemblies',
507530
srcdir: 'lib',
508531
bundledDeps: ['jsonschema@~1.4.1', 'semver'],
509-
devDeps: [cloudAssemblySchema],
532+
devDeps: [
533+
cloudAssemblySchema.customizeReference({ versionType: 'exact' }),
534+
],
510535
peerDeps: [
511536
cloudAssemblySchema.customizeReference({ versionType: 'any-future' }),
512537
],

0 commit comments

Comments
 (0)