Repository navigation
chore: publish cli-integ to npm only after aws-cdk is published #2095
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| import type { Monorepo } from 'cdklabs-projen-project-types/lib/yarn'; | ||
| import type { Project, github } from 'projen'; | ||
| import { Component } from 'projen'; | ||
|
|
||
| /** | ||
| * Make a package's npm publish job wait for the npm publish jobs of other packages. | ||
| * | ||
| * Release jobs are ordered by declared package dependencies. Use this for | ||
| * ordering that isn't expressed as a dependency. | ||
| */ | ||
| export class NpmPublishAfter extends Component { | ||
| constructor( | ||
| private readonly project_: Monorepo, | ||
| private readonly pkg: Project, | ||
| private readonly after: Project[], | ||
| ) { | ||
| super(project_); | ||
| } | ||
|
|
||
| public preSynthesize() { | ||
| const releaseWf = this.project_.github?.tryFindWorkflow('release'); | ||
| if (!releaseWf) { | ||
| throw new Error('Could not find release workflow'); | ||
| } | ||
|
|
||
| const jobId = npmJobId(this.pkg); | ||
| const job = releaseWf.getJob(jobId) as github.workflows.Job | undefined; | ||
| if (!job) { | ||
| throw new Error(`Could not find job ${jobId} in release workflow`); | ||
| } | ||
|
|
||
| releaseWf.updateJob(jobId, { | ||
| ...job, | ||
| needs: [...(job.needs ?? []), ...this.after.map(npmJobId)], | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| function npmJobId(project: Project) { | ||
| return `${project.name.replace('@', '').replace('/', '-')}_release_npm`; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🟡 Recommended — The
afterjob ids appended toneedsare never verified to exist as jobs in the workflow, unlike the targetpkgjob which is looked up viagetJoband throws loudly if missing. A typo'd package, a non-publishing package (releaseToNpm: false), or a name with more than one/(sincenpmJobIduses non-global.replace) would silently emit aneedson a job id that does not exist. GitHub Actions then rejects the whole workflow at parse time — a late, confusing failure — rather than failingyarn projensynth. The current single use (@aws-cdk-testing/cli-integafteraws-cdk) derives correctly, so the harm is latent for future callers.Suggested change: Resolve each
afterid withgetJoband throw with the same clear message used forpkgwhen the job is missing, so a bad reference fails at synth. Only append ids that resolve to real jobs.