Skip to content

Commit e47d32a

Browse files
authored
Merge branch 'main' into skip-jsii-build
2 parents db69498 + f25e658 commit e47d32a

File tree

107 files changed

+584
-405
lines changed

Some content is hidden

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

107 files changed

+584
-405
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/dependabot.yml

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

.github/workflows/codecov.yml

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

.github/workflows/codeql.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
name: "CodeQL"
1313

1414
on:
15+
workflow_dispatch: {}
16+
merge_group: {}
1517
push:
1618
branches: [ "main" ]
1719
pull_request:
18-
branches: [ "main" ]
20+
branches: [ "main" ]
1921
schedule:
2022
- cron: '21 23 * * 5'
2123

.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.

.github/workflows/release.yml

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

.gitignore

Lines changed: 1 addition & 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.

.projen/tasks.json

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

.projenrc.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import { Stability } from 'projen/lib/cdk';
44
import { BundleCli } from './projenrc/bundle';
55
import { ESLINT_RULES } from './projenrc/eslint';
66
import { JsiiBuild } from './projenrc/jsii';
7+
import { CodeCovWorkflow } from './projenrc/codecov';
8+
import { AdcPublishing } from './projenrc/adc-publishing';
79

810
// 5.7 sometimes gives a weird error in `ts-jest` in `@aws-cdk/cli-lib-alpha`
911
// https://github.com/microsoft/TypeScript/issues/60159
@@ -214,6 +216,8 @@ const repoProject = new yarn.Monorepo({
214216
},
215217
});
216218

219+
new AdcPublishing(repoProject);
220+
217221
// Eslint for projen config
218222
// @ts-ignore
219223
repoProject.eslint = new pj.javascript.Eslint(repoProject, {
@@ -863,7 +867,7 @@ cli.gitignore.addPatterns('build-info.json');
863867
const cliPackageJson = `${cli.workspaceDirectory}/package.json`;
864868

865869
cli.preCompileTask.prependExec('./generate.sh');
866-
cli.preCompileTask.prependExec('ts-node scripts/user-input-gen.ts');
870+
cli.preCompileTask.prependExec('ts-node --prefer-ts-exts scripts/user-input-gen.ts');
867871

868872
const includeCliResourcesCommands = [
869873
'cp $(node -p \'require.resolve("cdk-from-cfn/index_bg.wasm")\') ./lib/',
@@ -1093,7 +1097,7 @@ const toolkitLib = configureProject(
10931097
coverageThreshold: {
10941098
// this is very sad but we will get better
10951099
statements: 85,
1096-
branches: 77,
1100+
branches: 76,
10971101
functions: 77,
10981102
lines: 85,
10991103
},
@@ -1240,7 +1244,7 @@ new pj.YamlFile(repo, '.github/dependabot.yml', {
12401244
version: 2,
12411245
updates: ['pip', 'maven', 'nuget'].map((pkgEco) => ({
12421246
'package-ecosystem': pkgEco,
1243-
'directory': '/',
1247+
'directory': '/packages/aws-cdk/lib/init-templates',
12441248
'schedule': { interval: 'weekly' },
12451249
'labels': ['auto-approve'],
12461250
'open-pull-requests-limit': 5,
@@ -1278,4 +1282,9 @@ new CdkCliIntegTestsWorkflow(repo, {
12781282
],
12791283
});
12801284

1285+
new CodeCovWorkflow(repo, {
1286+
restrictToRepos: ['aws/aws-cdk-cli'],
1287+
packages: [cli.name],
1288+
});
1289+
12811290
repo.synth();

0 commit comments

Comments
 (0)