Skip to content

Commit

Permalink
Merge branch 'main' into cc-api-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mrgrain authored Feb 28, 2025
2 parents 33d406c + 8a73428 commit d084ed6
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/integ.yml

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

1 change: 0 additions & 1 deletion .projen/deps.json

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

4 changes: 2 additions & 2 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const repoProject = new yarn.Monorepo({

defaultReleaseBranch: 'main',
devDeps: [
'cdklabs-projen-project-types@^0.1.220',
'cdklabs-projen-project-types',
'glob',
'semver',
`@aws-sdk/client-s3@${CLI_SDK_V3_RANGE}`,
Expand Down Expand Up @@ -1328,11 +1328,11 @@ const APPROVAL_ENVIRONMENT = 'integ-approval';
const TEST_ENVIRONMENT = 'run-tests';

new CdkCliIntegTestsWorkflow(repo, {
sourceRepo: 'aws/aws-cdk-cli',
approvalEnvironment: APPROVAL_ENVIRONMENT,
testEnvironment: TEST_ENVIRONMENT,
buildRunsOn: POWERFUL_RUNNER,
testRunsOn: POWERFUL_RUNNER,
expectNewCliLibVersion: true,

localPackages: [
// CloudAssemblySchema is not in this list because in the way we're doing
Expand Down
2 changes: 1 addition & 1 deletion package.json

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

8 changes: 4 additions & 4 deletions yarn.lock

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

0 comments on commit d084ed6

Please sign in to comment.