Skip to content

Commit

Permalink
Merge branch 'main' into conroy/labels
Browse files Browse the repository at this point in the history
  • Loading branch information
kaizencc authored Feb 24, 2025
2 parents 1f69481 + 9d80cfc commit 5943304
Show file tree
Hide file tree
Showing 11 changed files with 265 additions and 11 deletions.
109 changes: 109 additions & 0 deletions .github/workflows/release.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { CodeCovWorkflow } from './projenrc/codecov';
import { ESLINT_RULES } from './projenrc/eslint';
import { IssueLabeler } from './projenrc/issue-labeler';
import { JsiiBuild } from './projenrc/jsii';
import { RecordPublishingTimestamp } from './projenrc/record-publishing-timestamp';

// 5.7 sometimes gives a weird error in `ts-jest` in `@aws-cdk/cli-lib-alpha`
// https://github.com/microsoft/TypeScript/issues/60159
Expand Down Expand Up @@ -225,6 +226,9 @@ const repoProject = new yarn.Monorepo({
},
});

new AdcPublishing(repoProject);
new RecordPublishingTimestamp(repoProject);

// Eslint for projen config
// @ts-ignore
repoProject.eslint = new pj.javascript.Eslint(repoProject, {
Expand Down Expand Up @@ -1020,9 +1024,7 @@ const TOOLKIT_LIB_EXCLUDE_PATTERNS = [

const toolkitLib = configureProject(
new yarn.TypeScriptWorkspace({
...genericCdkProps({
private: true,
}),
...genericCdkProps(),
parent: repo,
name: '@aws-cdk/toolkit-lib',
description: 'AWS CDK Programmatic Toolkit Library',
Expand Down Expand Up @@ -1199,6 +1201,7 @@ toolkitLib.addTask('docs', {
});
toolkitLib.addTask('publish-local', {
exec: './build-tools/package.sh',
receiveArgs: true,
});

//////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 2 additions & 0 deletions packages/@aws-cdk/toolkit-lib/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/@aws-cdk/toolkit-lib/.npmignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions packages/@aws-cdk/toolkit-lib/.projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 57 additions & 7 deletions packages/@aws-cdk/toolkit-lib/.projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/@aws-cdk/toolkit-lib/build-tools/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ cd "$(dirname $(dirname "$0"))"
rm -rf dist/
mkdir -p dist/js
npm pkg set version=0.0.0-alpha.$commit
npm pkg set dependencies.@aws-cdk/cloud-assembly-schema=$version
npm pkg set dependencies.@aws-cdk/cloudformation-diff=$version
npm pack --pack-destination dist/js
npm pkg set version=$reset
npm pkg set dependencies.@aws-cdk/cloudformation-diff=^$reset
npm pkg set dependencies.@aws-cdk/cloud-assembly-schema=^$reset
7 changes: 6 additions & 1 deletion packages/@aws-cdk/toolkit-lib/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5943304

Please sign in to comment.