Skip to content

Commit 7164e6d

Browse files
authored
Merge branch 'main' into huijbers/transitive-releases
2 parents 0d4118b + f25e658 commit 7164e6d

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
@@ -5,6 +5,8 @@ import { Stability } from 'projen/lib/cdk';
55
import { BundleCli } from './projenrc/bundle';
66
import { ESLINT_RULES } from './projenrc/eslint';
77
import { JsiiBuild } from './projenrc/jsii';
8+
import { CodeCovWorkflow } from './projenrc/codecov';
9+
import { AdcPublishing } from './projenrc/adc-publishing';
810

911
// 5.7 sometimes gives a weird error in `ts-jest` in `@aws-cdk/cli-lib-alpha`
1012
// https://github.com/microsoft/TypeScript/issues/60159
@@ -223,6 +225,8 @@ const repoProject = new yarn.Monorepo({
223225
},
224226
});
225227

228+
new AdcPublishing(repoProject);
229+
226230
// Eslint for projen config
227231
// @ts-ignore
228232
repoProject.eslint = new pj.javascript.Eslint(repoProject, {
@@ -874,7 +878,7 @@ cli.gitignore.addPatterns('build-info.json');
874878
const cliPackageJson = `${cli.workspaceDirectory}/package.json`;
875879

876880
cli.preCompileTask.prependExec('./generate.sh');
877-
cli.preCompileTask.prependExec('ts-node scripts/user-input-gen.ts');
881+
cli.preCompileTask.prependExec('ts-node --prefer-ts-exts scripts/user-input-gen.ts');
878882

879883
const includeCliResourcesCommands = [
880884
'cp $(node -p \'require.resolve("cdk-from-cfn/index_bg.wasm")\') ./lib/',
@@ -1103,7 +1107,7 @@ const toolkitLib = configureProject(
11031107
coverageThreshold: {
11041108
// this is very sad but we will get better
11051109
statements: 85,
1106-
branches: 77,
1110+
branches: 76,
11071111
functions: 77,
11081112
lines: 85,
11091113
},
@@ -1248,7 +1252,7 @@ new pj.YamlFile(repo, '.github/dependabot.yml', {
12481252
version: 2,
12491253
updates: ['pip', 'maven', 'nuget'].map((pkgEco) => ({
12501254
'package-ecosystem': pkgEco,
1251-
'directory': '/',
1255+
'directory': '/packages/aws-cdk/lib/init-templates',
12521256
'schedule': { interval: 'weekly' },
12531257
'labels': ['auto-approve'],
12541258
'open-pull-requests-limit': 5,
@@ -1286,4 +1290,9 @@ new CdkCliIntegTestsWorkflow(repo, {
12861290
],
12871291
});
12881292

1293+
new CodeCovWorkflow(repo, {
1294+
restrictToRepos: ['aws/aws-cdk-cli'],
1295+
packages: [cli.name],
1296+
});
1297+
12891298
repo.synth();

0 commit comments

Comments
 (0)