Skip to content

Commit

Permalink
Merge branch 'v2-main' into sumughan/add-session-tags-to-client-options
Browse files Browse the repository at this point in the history
  • Loading branch information
iliapolo committed Aug 31, 2024
2 parents 911260e + 1248c19 commit d39577a
Show file tree
Hide file tree
Showing 11 changed files with 643 additions and 438 deletions.
2 changes: 0 additions & 2 deletions .gitattributes

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

41 changes: 36 additions & 5 deletions .github/workflows/release.yml

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

89 changes: 0 additions & 89 deletions .github/workflows/upgrade-main.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .gitignore

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

10 changes: 5 additions & 5 deletions .projen/deps.json

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

2 changes: 0 additions & 2 deletions .projen/files.json

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

35 changes: 14 additions & 21 deletions .projen/tasks.json

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

39 changes: 28 additions & 11 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@ import { typescript } from 'projen';
const project = new typescript.TypeScriptProject({
name: 'cdk-assets',
projenrcTs: true,
publishDryRun: true,
defaultReleaseBranch: 'main',
majorVersion: 3,
prerelease: 'rc',
releaseBranches: {
'v2-main': {
majorVersion: 2,
},
},
defaultReleaseBranch: 'v2-main',
majorVersion: 2,
releaseToNpm: true,
autoApproveUpgrades: true,
autoApproveOptions: {
allowedUsernames: ['aws-cdk-automation'],
Expand Down Expand Up @@ -46,7 +40,7 @@ const project = new typescript.TypeScriptProject({
packageName: 'cdk-assets',
eslintOptions: {
prettier: true,
dirs: ['src', 'test', 'bin'],
dirs: ['test', 'bin', 'lib'],
},
jestOptions: {
jestConfig: {
Expand Down Expand Up @@ -83,7 +77,13 @@ const project = new typescript.TypeScriptProject({
include: ['bin/**/*.ts'],
},
srcdir: 'lib',
gitignore: ['**/*.d.ts', '**/*.js', '**/.DS_Store'],
gitignore: ['**/*.d.ts', '**/*.js', '**/.DS_Store', 'npm-shrinkwrap.json'],
releaseWorkflowSetupSteps: [
{
name: 'Shrinkwrap',
run: 'npx projen shrinkwrap',
},
],
});

project.addPackageIgnore('*.ts');
Expand All @@ -96,4 +96,21 @@ project.eslint?.addRules({
],
});

project.addTask('shrinkwrap', {
steps: [
{
spawn: 'bump',
},
{
exec: 'npm shrinkwrap',
},
{
spawn: 'unbump',
},
{
exec: 'git checkout HEAD -- yarn.lock',
},
],
});

project.synth();
Loading

0 comments on commit d39577a

Please sign in to comment.