Skip to content

Commit

Permalink
fix(release): try preventing race conditions (#911)
Browse files Browse the repository at this point in the history
See projen/projen#3763 for more detail. We decided to first put the solution in place on a controlled set of projects. If it proves successful, we will push it to projen itself.
  • Loading branch information
iliapolo authored Aug 7, 2024
1 parent e03ae01 commit 786c331
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/release.yml

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

2 changes: 2 additions & 0 deletions src/projects/jsii.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ export class Cdk8sTeamJsiiProject extends cdk.JsiiProject {
this.deps.removeDependency('@types/node^16');
this.deps.addDependency('@types/[email protected]', DependencyType.BUILD);

node.limitReleaseConcurrency(this);

}
}

Expand Down
16 changes: 15 additions & 1 deletion src/projects/node.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as deepmerge from 'deepmerge';
import { DependencyType, ReleasableCommits, javascript } from 'projen';
import { DependencyType, JsonPatch, Project, ReleasableCommits, javascript } from 'projen';
import { NodeProject, NodeProjectOptions, UpgradeDependencies, UpgradeDependenciesOptions, UpgradeDependenciesSchedule } from 'projen/lib/javascript';
import { Backport } from '../components/backport/backport';
import { CodeOfConductMD } from '../components/code-of-conduct/code-of-conduct';
Expand Down Expand Up @@ -185,6 +185,8 @@ export class Cdk8sTeamNodeProject extends javascript.NodeProject {
if (options.backport ?? false) {
new Backport(this, { branches: options.backportBranches, repoName });
}

limitReleaseConcurrency(this);
}
}

Expand Down Expand Up @@ -302,3 +304,15 @@ export function addComponents(project: NodeProject, repoName: string, options: C
}

}

// see https://github.com/projen/projen/pull/3763
export function limitReleaseConcurrency(project: Project) {

const regex = /^\.github\/workflows\/release/;
const releaseWorkflows = project.files.filter(f => regex.test(f.path));

for (const releaseWorkflow of releaseWorkflows) {
const objectFile = project.tryFindObjectFile(releaseWorkflow.path)!;
objectFile.patch(JsonPatch.add('/concurrency', { 'group': '${{ github.workflow }}', 'cancel-in-progress': false }));
}
}
2 changes: 2 additions & 0 deletions src/projects/typescript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,7 @@ export class Cdk8sTeamTypeScriptProject extends typescript.TypeScriptProject {
this.deps.removeDependency('@types/node');
this.deps.addDependency('@types/[email protected]', DependencyType.BUILD);

node.limitReleaseConcurrency(this);

}
}
21 changes: 21 additions & 0 deletions test/projects/__snapshots__/jsii.test.ts.snap

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

18 changes: 18 additions & 0 deletions test/projects/__snapshots__/node.test.ts.snap

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

21 changes: 21 additions & 0 deletions test/projects/__snapshots__/typescript.test.ts.snap

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

0 comments on commit 786c331

Please sign in to comment.